svn commit: r1922032 - in /subversion/branches/1.14.x: ./ STATUS build/generator/gen_win_dependencies.py

Author: svn-role
Date: Sat Nov 23 04:00:04 2024
New Revision: 1922032

URL: http://svn.apache.org/viewvc?rev=1922032&view=rev
Log:
Merge r1921266 from trunk:

 * r1921266
   Fix detection for zlib version in gen-make.py on Windows.
   Justification:
     Allow `1.3` and `1.3.1.1` for zlib version.
   Votes:
     +1: jun66j5, jcorvel
     Concept +1: dsahlberg

Modified:
    subversion/branches/1.14.x/   (props changed)
    subversion/branches/1.14.x/STATUS
    subversion/branches/1.14.x/build/generator/gen_win_dependencies.py

Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1921266

Modified: subversion/branches/1.14.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1922032&r1=1922031&r2=1922032&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Nov 23 04:00:04 2024
@@ -27,11 +27,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
-
- * r1921266
-   Fix detection for zlib version in gen-make.py on Windows.
-   Justification:
-     Allow `1.3` and `1.3.1.1` for zlib version.
-   Votes:
-     +1: jun66j5, jcorvel
-     Concept +1: dsahlberg

Modified: subversion/branches/1.14.x/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/build/generator/gen_win_dependencies.py?rev=1922032&r1=1922031&r2=1922032&view=diff
==============================================================================
--- subversion/branches/1.14.x/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/1.14.x/build/generator/gen_win_dependencies.py Sat Nov 23 04:00:04 2024
@@ -754,11 +754,11 @@ class GenDependenciesBase(gen_base.Gener
 
     txt = open(version_file_path).read()
     vermatch = re.search(
-                r'^\s*#define\s+ZLIB_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"',
+                r'^\s*#define\s+ZLIB_VERSION\s+"(\d+(?:\.\d+){1,3})(?:-\w+)?"',
                  txt, re.M)
 
-    version = tuple(map(int, vermatch.groups()))
-    self.zlib_version = '%d.%d.%d' % version
+    version = tuple(map(int, vermatch.group(1).split('.')))
+    self.zlib_version = '.'.join(map(str, version))
 
     if version < minimal_zlib_version:
       sys.stderr.write("ERROR: ZLib %s or higher is required "