From f8e4a5cc250ad8ee885061e30de8084f7d57981b Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Thu, 20 Jan 2022 22:24:53 +0000 Subject: [PATCH] Few more PCRE to PCRE2 changes --- Doc/Manual/Preface.html | 8 ++++---- Doc/Manual/SWIG.html | 6 +++--- Source/Modules/main.cxx | 2 +- Source/Swig/misc.c | 2 +- Tools/mkwindows.sh | 2 +- Tools/pcre-build.sh | 26 +++++++++++++------------- configure.ac | 18 +++++++++--------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Doc/Manual/Preface.html b/Doc/Manual/Preface.html index 24e844c..41f21d4 100644 --- a/Doc/Manual/Preface.html +++ b/Doc/Manual/Preface.html @@ -281,12 +281,12 @@ You must use GNU make to build a

-PCRE +PCRE2 needs to be installed on your system to build SWIG, in particular -pcre2-config must be available. If you have PCRE headers and libraries but not +pcre2-config must be available. If you have PCRE2 headers and libraries but not pcre2-config itself or, alternatively, wish to override the compiler or linker -flags returned by pcre-config, you may set PCRE2_LIBS and PCRE2_CFLAGS variables -to be used instead. And if you don't have PCRE at all, the configure script +flags returned by pcre2-config, you may set PCRE2_LIBS and PCRE2_CFLAGS variables +to be used instead. And if you don't have PCRE2 at all, the configure script will provide instructions for obtaining it.

diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html index 876c0ac..d39c0f3 100644 --- a/Doc/Manual/SWIG.html +++ b/Doc/Manual/SWIG.html @@ -208,7 +208,7 @@ General Options -oh <headfile> - Set name of C++ output header file for directors to <headfile> -outcurrentdir - Set default output dir to current dir instead of input file's path -outdir <dir> - Set language specific files output directory to <dir> - -pcreversion - Display PCRE version information + -pcreversion - Display PCRE2 version information -small - Compile in virtual elimination and compact mode -swiglib - Report location of SWIG library and exit -templatereduce - Reduce all the typedefs in templates @@ -2022,8 +2022,8 @@ and a more descriptive one, but the two functions are otherwise equivalent: String after (Perl-like) regex substitution operation. This function allows to apply arbitrary regular expressions to the identifier names. The pattern part is a regular expression in Perl syntax (as supported - by the Perl Compatible Regular Expressions (PCRE)) - library and the subst string + by the Perl Compatible Regular Expressions) + (PCRE2 library) and the subst string can contain back-references of the form \N where N is a digit from 0 to 9, or one of the following escape sequences: \l, \L, \u, \U or \E. The back-references are replaced with the diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx index d8f2ab6..1476ddb 100644 --- a/Source/Modules/main.cxx +++ b/Source/Modules/main.cxx @@ -137,7 +137,7 @@ static const char *usage4 = (const char *) "\ -oh - Set name of C++ output header file for directors to \n\ -outcurrentdir - Set default output dir to current dir instead of input file's path\n\ -outdir - Set language specific files output directory to \n\ - -pcreversion - Display PCRE version information\n\ + -pcreversion - Display PCRE2 version information\n\ -small - Compile in virtual elimination and compact mode\n\ -swiglib - Report location of SWIG library and exit\n\ -templatereduce - Reduce all the typedefs in templates\n\ diff --git a/Source/Swig/misc.c b/Source/Swig/misc.c index 1324f4d..62a9787 100644 --- a/Source/Swig/misc.c +++ b/Source/Swig/misc.c @@ -1493,7 +1493,7 @@ String *Swig_pcre_version(void) { char *buf = malloc(len); String *result; pcre2_config(PCRE2_CONFIG_VERSION, buf); - result = NewStringf("PCRE Version: %s", buf); + result = NewStringf("PCRE2 Version: %s", buf); free(buf); return result; } diff --git a/Tools/mkwindows.sh b/Tools/mkwindows.sh index 4717e1c..ad96c97 100755 --- a/Tools/mkwindows.sh +++ b/Tools/mkwindows.sh @@ -87,7 +87,7 @@ tarball=$swigbasename.tar.gz pcre_tarball=`ls pcre2-*.tar.*` if ! test -f "$pcre_tarball"; then - echo "Could not find PCRE tarball. Please download a PCRE source tarball from http://www.pcre.org" + echo "Could not find PCRE2 tarball. Please download a PCRE2 source tarball from http://www.pcre.org" echo "and place in the same directory as the SWIG tarball." exit 1 fi diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh index ffa7a69..e986d68 100755 --- a/Tools/pcre-build.sh +++ b/Tools/pcre-build.sh @@ -4,17 +4,17 @@ pcre_subdir=pcre/pcre-swig-install pcre_install_dir=`pwd`/$pcre_subdir usage() { - echo "Helper script to build PCRE as a static library from a tarball just for use during the" - echo "SWIG build. It does not install PCRE for global use on your system." + echo "Helper script to build PCRE2 as a static library from a tarball just for use during the" + echo "SWIG build. It does not install PCRE2 for global use on your system." echo "Usage: pcre-build.sh [--help] [args]" - echo " args - optional additional arguments passed on to the PCRE configure script (leave out" + echo " args - optional additional arguments passed on to the PCRE2 configure script (leave out" echo " unless you are an expert at configure)" echo " --help - Display this help information." echo "Instructions:" - echo " - Download the latest PCRE source tarball from http://www.pcre.org and place in the" + echo " - Download the latest PCRE2 source tarball from http://www.pcre.org and place in the" echo " directory that you will configure and build SWIG." echo " - Run this script in the same directory that you intend to configure and build SWIG in." - echo " This will configure and build PCRE as a static library." + echo " This will configure and build PCRE2 as a static library." echo " - Afterwards run the SWIG configure script which will then find and use the PCRE static" echo " libraries in the $pcre_subdir subdirectory." exit 0 @@ -35,21 +35,21 @@ if test -f "pcre-build.sh" ; then usage fi -echo "Looking for PCRE tarball..." +echo "Looking for PCRE2 tarball..." rm -rf pcre pcre_tarball=`ls pcre2-*.tar*` test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre2-*.tar*" -test -f "$pcre_tarball" || bail "Could not find a single PCRE tarball. Found: $pcre_tarball" +test -f "$pcre_tarball" || bail "Could not find a single PCRE2 tarball. Found: $pcre_tarball" echo "Extracting tarball: $pcre_tarball" tar -xf $pcre_tarball || bail "Could not untar $pcre_tarball" pcre_dir=`echo $pcre_tarball | sed -e "s/\.tar.*//"` echo "Configuring PCRE in directory: pcre" mv $pcre_dir pcre || bail "Could not create pcre directory" -cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE configure failed" -echo "Building PCRE..." -${MAKE:-make} -s || bail "Could not build PCRE" -echo "Installing PCRE locally to $pcre_install_dir..." -${MAKE:-make} -s install || bail "Could not install PCRE" +cd pcre && ./configure --prefix=$pcre_install_dir --disable-shared $* || bail "PCRE2 configure failed" +echo "Building PCRE2..." +${MAKE:-make} -s || bail "Could not build PCRE2" +echo "Installing PCRE2 locally to $pcre_install_dir..." +${MAKE:-make} -s install || bail "Could not install PCRE2" echo "" -echo "The SWIG configure script can now be run, whereupon PCRE will automatically be detected and used from $pcre_install_dir/bin/pcre-config." +echo "The SWIG configure script can now be run, whereupon PCRE2 will automatically be detected and used from $pcre_install_dir/bin/pcre-config." diff --git a/configure.ac b/configure.ac index c5ae9fc..209dba1 100644 --- a/configure.ac +++ b/configure.ac @@ -48,16 +48,16 @@ fi dnl PCRE AC_ARG_WITH([pcre], [AS_HELP_STRING([--without-pcre], - [Disable support for regular expressions using PCRE])], + [Disable support for regular expressions using PCRE2])], [], [with_pcre=yes]) -AC_MSG_CHECKING([whether to enable PCRE support]) +AC_MSG_CHECKING([whether to enable PCRE2 support]) AC_MSG_RESULT([$with_pcre]) dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script if test x"${with_pcre}" = xyes ; then - AC_MSG_CHECKING([whether to use local PCRE]) + AC_MSG_CHECKING([whether to use local PCRE2]) local_pcre_config=no if test -z $PCRE2_CONFIG; then if test -f `pwd`/pcre/pcre-swig-install/bin/pcre2-config; then @@ -71,20 +71,20 @@ AS_IF([test "x$with_pcre" != xno], [AX_PATH_GENERIC([pcre2], [], dnl Minimal version of PCRE we need -- accept any [], dnl custom sed script for version parsing is not needed - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) + [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE2 library]) LIBS="$LIBS $PCRE2_LIBS" CPPFLAGS="$CPPFLAGS $PCRE2_CFLAGS" ], [AC_MSG_FAILURE([ - Cannot find pcre2-config script from PCRE (Perl Compatible Regular Expressions) + Cannot find pcre2-config script from PCRE2 (Perl Compatible Regular Expressions) library package. This dependency is needed for configure to complete, Either: - - Install the PCRE developer package on your system (preferred approach). - - Download the PCRE source tarball, build and install on your system + - Install the PCRE2 developer package on your system (preferred approach). + - Download the PCRE2 source tarball, build and install on your system as you would for any package built from source distribution. - - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically + - Use the Tools/pcre-build.sh script to build PCRE2 just for SWIG to statically link against. Run 'Tools/pcre-build.sh --help' for instructions. - (quite easy and does not require privileges to install PCRE on your system) + (quite easy and does not require privileges to install PCRE2 on your system) - Use configure --without-pcre to disable regular expressions support in SWIG (not recommended).]) ], -- 1.8.3.1