diff --git a/cmake/PCRE2.cmake b/cmake/PCRE2.cmake index 23f483551..7f78c207a 100644 --- a/cmake/PCRE2.cmake +++ b/cmake/PCRE2.cmake @@ -3,9 +3,9 @@ SET(PCRE2_WIDTH ${WCHAR_T_BITS}) SET(PCRE2_BUILD_PCRE2_8 OFF CACHE BOOL "Build 8bit PCRE2 library") SET(PCRE2_BUILD_PCRE2_${PCRE2_WIDTH} ON CACHE BOOL "Build ${PCRE2_WIDTH}bit PCRE2 library") SET(PCRE2_SHOW_REPORT OFF CACHE BOOL "Show the final configuration report") +SET(PCRE2_BUILD_TESTS OFF CACHE BOOL "Build tests") SET(PCRE2_BUILD_PCRE2GREP OFF CACHE BOOL "Build pcre2grep") - SET(PCRE2_MIN_VERSION 10.21) FIND_LIBRARY(PCRE2_LIB pcre2-${PCRE2_WIDTH}) FIND_PATH(PCRE2_INCLUDE_DIR pcre2.h) @@ -13,8 +13,8 @@ IF (PCRE2_LIB AND PCRE2_INCLUDE_DIR) MESSAGE(STATUS "Found system PCRE2 library ${PCRE2_INCLUDE_DIR}") ELSE() MESSAGE(STATUS "Using bundled PCRE2 library") - ADD_SUBDIRECTORY(pcre2-10.32 EXCLUDE_FROM_ALL) - SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2-10.32/) + ADD_SUBDIRECTORY(pcre2-10.34 EXCLUDE_FROM_ALL) + SET(PCRE2_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pcre2-10.34/) SET(PCRE2_LIB pcre2-${PCRE2_WIDTH}) endif(PCRE2_LIB AND PCRE2_INCLUDE_DIR) INCLUDE_DIRECTORIES(${PCRE2_INCLUDE_DIR}) diff --git a/pcre2-10.32/132html b/pcre2-10.32/132html deleted file mode 100755 index 1bd62ba24..000000000 --- a/pcre2-10.32/132html +++ /dev/null @@ -1,314 +0,0 @@ -#! /usr/bin/perl -w - -# Script to turn PCRE2 man pages into HTML - - -# Subroutine to handle font changes and other escapes - -sub do_line { -my($s) = $_[0]; - -$s =~ s/</g; # Deal with < and > -$s =~ s/>/>/g; -$s =~ s"\\fI(.*?)\\f[RP]"$1"g; -$s =~ s"\\fB(.*?)\\f[RP]"$1"g; -$s =~ s"\\e"\\"g; -$s =~ s/(?<=Copyright )\(c\)/©/g; -$s; -} - -# Subroutine to ensure not in a paragraph - -sub end_para { -if ($inpara) - { - print TEMP "\n" if ($inpre); - print TEMP "
\n"; - } -$inpara = $inpre = 0; -$wrotetext = 0; -} - -# Subroutine to start a new paragraph - -sub new_para { -&end_para(); -print TEMP "\n";
-$inpara = 1;
-}
-
-
-# Main program
-
-$innf = 0;
-$inpara = 0;
-$inpre = 0;
-$wrotetext = 0;
-$toc = 0;
-$ref = 1;
-
-while ($#ARGV >= 0 && $ARGV[0] =~ /^-/)
- {
- $toc = 1 if $ARGV[0] eq "-toc";
- shift;
- }
-
-# Initial output to STDOUT
-
-print <
-Return to the PCRE2 index page.
-
-This page is part of the PCRE2 HTML documentation. It was generated
-automatically from the original man page. If there is any nonsense in it,
-please consult the man page, in case the conversion went wrong.
-$ARGV[0] man page
-
-End
-
-print "\n" if ($toc);
-
-open(TEMP, ">/tmp/$$") || die "Can't open /tmp/$$ for output\n";
-
-while (
\n" if ($toc);
-
-# Copy the remainder to the standard output
-
-close(TEMP);
-open(TEMP, "/tmp/$$") || die "Can't open /tmp/$$ for input\n";
-
-print while (
- # and
that delimit literal sections will do the spacing. Always skip
- # if no previous output.
-
- elsif (/^\.sp/)
- {
- if ($wrotetext)
- {
- $_ =
\n
\n" if ($innf || /^\.nf/ || !/^[\s.]/);
- }
- redo; # Now process the lookahead line we just read
- }
- }
- elsif (/^\.TP/ || /^\.PP/ || /^\.P/)
- {
- &new_para();
- }
- elsif (/^\.SH\s*("?)(.*)\1/)
- {
- # Ignore the NAME section
- if ($2 =~ /^NAME\b/)
- {
-
$title
\n",
- $ref);
- $ref++;
- }
- else
- {
- print TEMP "
\n$title\n
\n";
- }
- }
- elsif (/^\.SS\s*("?)(.*)\1/)
- {
- &end_para();
- my($title) = &do_line($2);
- print TEMP "
\n$title\n
\n";
- }
- elsif (/^\.B\s*(.*)/)
- {
- &new_para() if (!$inpara);
- $_ = &do_line($1);
- s/"(.*?)"/$1/g;
- print TEMP "$_\n";
- $wrotetext = 1;
- }
- elsif (/^\.I\s*(.*)/)
- {
- &new_para() if (!$inpara);
- $_ = &do_line($1);
- s/"(.*?)"/$1/g;
- print TEMP "$_\n";
- $wrotetext = 1;
- }
-
- # A comment that starts "HREF" takes the next line as a name that
- # is turned into a hyperlink, using the text given, which might be
- # in a special font. If it ends in () or (digits) or punctuation, they
- # aren't part of the link.
-
- elsif (/^\.\\"\s*HREF/)
- {
- $_=\n";
- while (
\n";
- $inpre = 1;
- }
- }
- elsif ($inpre)
- {
- print TEMP "\n";
- $inpre = 0;
- }
-
- # Add
to the end of a non-literal line if we are within .nf/.fi
-
- $_ .= "
\n" if (!$inpre && $innf);
-
- print TEMP;
- $wrotetext = 1;
- }
-
-# The TOC, if present, will have been written - terminate it
-
-print "