Author: svn-role
Date: Sat Jul 4 04:00:18 2026
New Revision: 1935865
Log:
Merge r1934466 from trunk:
* r1934466
Fix detection for zlib version in vcxproj build on Windows.
Justification:
Fix vcxproj build with zlib 1.3.2+ on Windows.
Votes:
+1: jun66j5, ivan
+0: brane, dsahlberg (review only, can't test)
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/build/generator/gen_win_dependencies.py
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Sat Jul 4 04:00:11 2026
(r1935864)
+++ subversion/branches/1.15.x/STATUS Sat Jul 4 04:00:18 2026
(r1935865)
@@ -95,14 +95,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1934466
- Fix detection for zlib version in vcxproj build on Windows.
- Justification:
- Fix vcxproj build with zlib 1.3.2+ on Windows.
- Votes:
- +1: jun66j5, ivan
- +0: brane, dsahlberg (review only, can't test)
-
* r1934965
Replace obsolete Autoconf construct in configure.ac.
Justification:
Modified: subversion/branches/1.15.x/build/generator/gen_win_dependencies.py
==============================================================================
--- subversion/branches/1.15.x/build/generator/gen_win_dependencies.py Sat Jul
4 04:00:11 2026 (r1935864)
+++ subversion/branches/1.15.x/build/generator/gen_win_dependencies.py Sat Jul
4 04:00:18 2026 (r1935865)
@@ -752,16 +752,18 @@ class GenDependenciesBase(gen_base.Gener
inc_path = os.path.join(self.zlib_path, 'include')
lib_path = os.path.join(self.zlib_path, 'lib')
- # Different build options produce different library names :(
- if os.path.exists(os.path.join(lib_path, 'zlibstatic.lib')):
- # CMake default: zlibstatic.lib (static) and zlib.lib (dll)
- lib_name = 'zlibstatic.lib'
- elif os.path.exists(os.path.join(lib_path, 'zlibstat.lib')):
- # Visual Studio project file default: zlibstat.lib (static) and
zlibwapi.lib (dll)
- lib_name = 'zlibstat.lib'
+ # Different versions and build options produce different library names :(
+ for name in (
+ 'z.lib', # >= 1.3.2 (shared)
+ 'zs.lib', # >= 1.3.2 (static)
+ 'zlibstatic.lib', # < 1.3.2 (cmake default)
+ 'zlibstat.lib', # < 1.3.2 (Visual Studio default)
+ ):
+ if os.path.exists(os.path.join(lib_path, name)):
+ lib_name = name
+ break
else:
- # Standard makefile produces zlib.lib (static) and zdll.lib (dll)
- lib_name = 'zlib.lib'
+ lib_name = 'zlib.lib' # < 1.3.2 (Standard makefile; fallback)
debug_lib_name = None
else:
# We have a source location
