svn commit: r1920896 - /subversion/trunk/tools/dist/release.py

Author: dsahlberg
Date: Wed Sep 25 07:53:01 2024
New Revision: 1920896

URL: http://svn.apache.org/viewvc?rev=1920896&view=rev
Log:
Followup to r1919355:
Only generate the CMake build system if releasing 1.15.0 or later.
The problem was run into when preparing for 1.14.4, when running relase.py
from /trunk while releasing a version that doesn't have the cmake build system.

* tools/dist/release.py
  (roll_tarballs): Check the version before running gen-make.py -t cmake

Review by: stsp


Modified:
    subversion/trunk/tools/dist/release.py

Modified: subversion/trunk/tools/dist/release.py
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/release.py?rev=1920896&r1=1920895&r2=1920896&view=diff
==============================================================================
--- subversion/trunk/tools/dist/release.py (original)
+++ subversion/trunk/tools/dist/release.py Wed Sep 25 07:53:01 2024
@@ -910,8 +910,9 @@ 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))
-    run_script(args.verbose,
-               'python gen-make.py -t cmake --release')
+    if not args.version < Version("1.15.0"):
+      run_script(args.verbose,
+                 'python gen-make.py -t cmake --release')
     clean_pycache()  # as with clean_autom4te, is this pointless on Windows?
     os.chdir(cwd)
     clean_autom4te() # dist.sh does it but pointless on Windows?
@@ -928,8 +929,9 @@ def roll_tarballs(args):
                '''tools/po/po-update.sh pot
                   ./autogen.sh --release''',
                hide_stderr=True) # SWIG is noisy
-    run_script(args.verbose,
-               'python gen-make.py -t cmake --release')
+    if not args.version < Version("1.15.0"):
+      run_script(args.verbose,
+                 'python gen-make.py -t cmake --release')
     clean_pycache()  # without this, tarballs contain empty __pycache__ dirs
     os.chdir(cwd)
     clean_autom4te() # dist.sh does it but probably pointless