From 22b568eee61d04f14a4e58e6e10fa625cc173d71 Mon Sep 17 00:00:00 2001 From: ph10 Date: Fri, 4 Dec 2020 14:30:03 +0000 Subject: [PATCH] Final file tidies for 10.36 --- ChangeLog | 12 ++++++++---- NEWS | 5 ++++- README | 11 ++++++++++- RunGrepTest | 2 +- RunTest | 4 ++-- configure.ac | 4 ++-- doc/html/README.txt | 11 ++++++++++- src/config.h.generic | 6 +++--- src/pcre2.h.generic | 4 ++-- 9 files changed, 42 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7f1e54..2e20bdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ Change Log for PCRE2 -------------------- -Version 10.36-RC1 05-November-2020 +Version 10.36-RC1 04-December-2020 ---------------------------------- 1. Add CET_CFLAGS so that when Intel CET is enabled, pass -mshstk to @@ -88,19 +88,23 @@ whose code points are greater than 255 in Unicode mode. 17. Applied the patch from Bugzilla #2628 to RunGrepTest. This does an explicit test for a version of sed that can handle binary zero, instead of assuming that -any Linux version will work. +any Linux version will work. Later: replaced $(...) by `...` because not all +shells recognize the former. 18. Fixed a word boundary check bug in JIT when partial matching is enabled. 19. Fix ARM64 compilation warning in JIT. Patch by Carlo. -20. A bug in the RunTest script meant that if the first part of test 2 failed, +20. A bug in the RunTest script meant that if the first part of test 2 failed, the failure was not reported. -21. Test 2 was failing when run from a directory other than the source +21. Test 2 was failing when run from a directory other than the source directory. This failure was previously missed in RunTest because of 20 above. Fixes added to both RunTest and RunTest.bat. +22. Patch to CMakeLists.txt from Daniel to fix problem with testing under +Windows. + Version 10.35 09-May-2020 --------------------------- diff --git a/NEWS b/NEWS index 066b264..de797e7 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ News about PCRE2 releases ------------------------- -Version 10.36 05-November-2020 +Version 10.36 04-December-2020 ------------------------------ Again, mainly bug fixes and tidies. The only enhancements are the addition of @@ -11,6 +11,9 @@ handling of substitution strings for both -O and callouts in pcre2grep, with the addition of $x{...} and $o{...} to allow for characters whose code points are greater than 255 in Unicode mode. +NOTE: there is an outstanding issue with JIT support for MacOS on arm64 +hardware. For details, please see Bugzilla issue #2618. + Version 10.35 15-April-2020 --------------------------- diff --git a/README b/README index cb4a065..1d6df8f 100644 --- a/README +++ b/README @@ -757,6 +757,15 @@ that represent character classes for code points less than 256. The final 8 decimal digit 16 alphanumeric or '_' +You can also specify -b (with or without -L) when running pcre2_dftables. This +causes the tables to be written in binary instead of as source code. A set of +binary tables can be loaded into memory by an application and passed to +pcre2_compile() in the same way as tables created dynamically by calling +pcre2_maketables(). The tables are just a string of bytes, independent of +hardware characteristics such as endianness. This means they can be bundled +with an application that runs in different environments, to ensure consistent +behaviour. + See also the pcre2build section "Creating character tables at build time". @@ -894,4 +903,4 @@ The distribution should contain the files listed below. Philip Hazel Email local part: Philip.Hazel Email domain: gmail.com -Last updated: 06 November 2020 +Last updated: 04 December 2020 diff --git a/RunGrepTest b/RunGrepTest index 36f1d1b..4d514e4 100755 --- a/RunGrepTest +++ b/RunGrepTest @@ -763,7 +763,7 @@ $valgrind $vjs $pcre2grep -n --newline=anycrlf "^(abc|def|ghi|jkl)" testNinputgr # doesn't. printf '%c--------------------------- Test N7 ------------------------------\r\n' - >>testtrygrep -Z=$(printf '\0' | sed 's/\x00/Z/g') +Z=`printf '\0' | sed 's/\x00/Z/g'` if [ "$Z" = "Z" ]; then printf 'abc\0def' >testNinputgrep $valgrind $vjs $pcre2grep -na --newline=nul "^(abc|def)" testNinputgrep | sed 's/\x00/ZERO/g' >>testtrygrep diff --git a/RunTest b/RunTest index 61ae8fd..14d9f60 100755 --- a/RunTest +++ b/RunTest @@ -494,11 +494,11 @@ for bmode in "$test8" "$test16" "$test32"; do fi # PCRE2 tests that are not Perl-compatible: API, errors, internals. We copy - # the testbtables file to the current directory for use by this test. + # the testbtables file to the current directory for use by this test. if [ $do2 = yes ] ; then echo $title2 "(excluding UTF-$bits)" - cp $testdata/testbtables . + cp $testdata/testbtables . for opt in "" $jitopt; do $sim $valgrind ${opt:+$vjs} ./pcre2test -q $setstack $bmode $opt $testdata/testinput2 testtry saverc=$? diff --git a/configure.ac b/configure.ac index 2a085a1..af26f0b 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ dnl be defined as -RC2, for example. For real releases, it should be empty. m4_define(pcre2_major, [10]) m4_define(pcre2_minor, [36]) -m4_define(pcre2_prerelease, [-RC1]) -m4_define(pcre2_date, [2020-11-05]) +m4_define(pcre2_prerelease, []) +m4_define(pcre2_date, [2020-12-04]) # Libtool shared library interface versions (current:revision:age) m4_define(libpcre2_8_version, [10:1:10]) diff --git a/doc/html/README.txt b/doc/html/README.txt index cb4a065..1d6df8f 100644 --- a/doc/html/README.txt +++ b/doc/html/README.txt @@ -757,6 +757,15 @@ that represent character classes for code points less than 256. The final 8 decimal digit 16 alphanumeric or '_' +You can also specify -b (with or without -L) when running pcre2_dftables. This +causes the tables to be written in binary instead of as source code. A set of +binary tables can be loaded into memory by an application and passed to +pcre2_compile() in the same way as tables created dynamically by calling +pcre2_maketables(). The tables are just a string of bytes, independent of +hardware characteristics such as endianness. This means they can be bundled +with an application that runs in different environments, to ensure consistent +behaviour. + See also the pcre2build section "Creating character tables at build time". @@ -894,4 +903,4 @@ The distribution should contain the files listed below. Philip Hazel Email local part: Philip.Hazel Email domain: gmail.com -Last updated: 06 November 2020 +Last updated: 04 December 2020 diff --git a/src/config.h.generic b/src/config.h.generic index 077141d..10f4104 100644 --- a/src/config.h.generic +++ b/src/config.h.generic @@ -224,7 +224,7 @@ sure both macros are undefined; an emulation function will then be used. */ #define PACKAGE_NAME "PCRE2" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PCRE2 10.36-RC1" +#define PACKAGE_STRING "PCRE2 10.36" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcre2" @@ -233,7 +233,7 @@ sure both macros are undefined; an emulation function will then be used. */ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "10.36-RC1" +#define PACKAGE_VERSION "10.36" /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested parentheses (of any kind) in a pattern. This limits the amount of system @@ -358,7 +358,7 @@ sure both macros are undefined; an emulation function will then be used. */ #endif /* Version number of package */ -#define VERSION "10.36-RC1" +#define VERSION "10.36" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/src/pcre2.h.generic b/src/pcre2.h.generic index 9653cd6..f204ec8 100644 --- a/src/pcre2.h.generic +++ b/src/pcre2.h.generic @@ -43,8 +43,8 @@ POSSIBILITY OF SUCH DAMAGE. #define PCRE2_MAJOR 10 #define PCRE2_MINOR 36 -#define PCRE2_PRERELEASE -RC1 -#define PCRE2_DATE 2020-11-05 +#define PCRE2_PRERELEASE +#define PCRE2_DATE 2020-12-04 /* When an application links to a PCRE DLL in Windows, the symbols that are imported have to be identified as such. When building PCRE2, the appropriate