Author: svn-role
Date: Thu Jul 16 04:00:10 2026
New Revision: 1936187
Log:
Merge r1936132 from trunk:
* r1936132
cmake: Sort CMake target conditions to generate stable targets.cmake.
Justification:
Release tarball content must be stable. Blocks 1.15.0 because otherwise
the tarball's content is not reproducible.
Votes:
+1: kotkov, rinrab, ivan, dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/build/generator/gen_cmake.py
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Thu Jul 16 03:02:10 2026
(r1936186)
+++ subversion/branches/1.15.x/STATUS Thu Jul 16 04:00:10 2026
(r1936187)
@@ -60,14 +60,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1936132
- cmake: Sort CMake target conditions to generate stable targets.cmake.
- Justification:
- Release tarball content must be stable. Blocks 1.15.0 because otherwise
- the tarball's content is not reproducible.
- Votes:
- +1: kotkov, rinrab, ivan, dsahlberg
-
* r1936038, r1936039
Don't use full path in the header of the generated config_keys.inc file
Justification:
Modified: subversion/branches/1.15.x/build/generator/gen_cmake.py
==============================================================================
--- subversion/branches/1.15.x/build/generator/gen_cmake.py Thu Jul 16
03:02:10 2026 (r1936186)
+++ subversion/branches/1.15.x/build/generator/gen_cmake.py Thu Jul 16
04:00:10 2026 (r1936187)
@@ -210,7 +210,7 @@ class Generator(gen_base.GeneratorBase):
else:
install_target = False
- enable_condition = list(set(enable_condition))
+ enable_condition = sorted(list(set(enable_condition)))
if len(enable_condition) > 0:
enable_condition_str = " AND ".join(enable_condition)
else:
