Author: kotkov
Date: Mon Apr 27 19:07:27 2026
New Revision: 1933405
Log:
Following up on r1920896, fix CMake pregeneration for 1.15.0 prerelease builds
in the release.py script.
The previously used check (`if not args.version < Version("1.15.0")`) does
not include prerelease versions such as "1.15.0-rc1". This happens because
prerelease versions are comparatively *less* than a final version such as
"1.15.0".
To fix this, check against 1.15.0-alpha1, which is the first possible prelease
version. This approach aligns with existing checks within the release.py file:
if args.version < Version("1.11.0-alpha1"):
# 1.10 and earlier generate *.sha1 files for compatibility reasons.
…
It could probably be improved by constructing a normalized version object like
`new Version(args.version.major, args.version.minor)` and using it in the
comparison. But for now let's use the simple way to fix the issue, while
remaining consistent with the other checks in release.py.
* tools/dist/release.py
(roll_tarballs): Update version check to include 1.15.0 prereleases
when running `python gen-make.py -t cmake`.
Modified:
subversion/trunk/tools/dist/release.py
Modified: subversion/trunk/tools/dist/release.py
==============================================================================
--- subversion/trunk/tools/dist/release.py Mon Apr 27 19:00:23 2026
(r1933404)
+++ subversion/trunk/tools/dist/release.py Mon Apr 27 19:07:27 2026
(r1933405)
@@ -882,7 +882,7 @@ def roll_tarballs(args):
# line endings and won't run, so use the one in the working copy.
run_script(args.verbose,
'%s/tools/po/po-update.sh pot' % get_workdir(args.base_dir))
- if not args.version < Version("1.15.0"):
+ if not args.version < Version("1.15.0-alpha1"):
run_script(args.verbose,
'python gen-make.py -t cmake --release')
clean_pycache() # as with clean_autom4te, is this pointless on Windows?
@@ -901,7 +901,7 @@ def roll_tarballs(args):
'''tools/po/po-update.sh pot
./autogen.sh --release''',
hide_stderr=True) # SWIG is noisy
- if not args.version < Version("1.15.0"):
+ if not args.version < Version("1.15.0-alpha1"):
run_script(args.verbose,
'python gen-make.py -t cmake --release')
clean_pycache() # without this, tarballs contain empty __pycache__ dirs
