Merge branch 'finialize-release-script' into integration

Jürgen Knödlseder
2 parents 2c430505 14595ab6
Showing 1 changed file with 26 additions and 26 deletions
dev/release.py
@@ -417,27 +417,28 @@ def set_package_version(version):
 # ============= #
 # Build tarball #
 # ============= #
-def build_tarball(branch, folder):
+def build_tarball():
     """
     Build tarball using 'make dist'
-
-    Parameters
-    ----------
-    branch : str
-        Git branch
-    folder : str
-        Folder name
     """
     # Set base path
     base_path = os.getcwd()
     # Enable/disable logging
     if confirm("Log actions in logfile?"):
-        verbosity = ' >> %s/%s.log 2>&1' % (base_path, folder)
-        os.system('rm -rf %s.log >/dev/null 2>&1' % folder)
+        verbosity = ' >> %s/make_dist.log 2>&1' % (base_path)
+        os.system('rm -rf make_dist.log >/dev/null 2>&1')
     else:
         verbosity = ' >/dev/null 2>&1'
+    # Configure package
+    print("Configure package")
+    rc = os.system('./configure%s' % verbosity)
+    if rc == 0:
+        print("Package configuration successful")
+    else:
+        print("*** Failure in package configuration")
+
     # Check package
     print("Create tarball")
     rc = os.system('make dist%s' % verbosity)
@@ -453,7 +454,7 @@ def build_tarball(branch, folder):
 # ============= #
 # Check tarball #
 # ============= #
-def check_tarball(filename):
+def check_tarball():
     """
     Check tarball using 'make distcheck'
@@ -465,17 +466,21 @@ def check_tarball(filename):
     # Set base path
     base_path = os.getcwd()
-    # Set base folder
-    folder = filename.rstrip('.tar.gz')
-
     # Enable/disable logging
     if confirm("Log check in logfile?"):
-        name      = filename.rstrip('.tar.gz')
-        verbosity = ' >> %s/%s.check 2>&1' % (base_path, folder)
-        os.system('rm -rf %s.check >/dev/null 2>&1' % folder)
+        verbosity = ' >> %s/make_distcheck.log 2>&1' % (base_path)
+        os.system('rm -rf make_distcheck.log >/dev/null 2>&1')
     else:
         verbosity = ' >/dev/null 2>&1'
+    # Configure package
+    print("Configure package")
+    rc = os.system('./configure%s' % verbosity)
+    if rc == 0:
+        print("Package configuration successful")
+    else:
+        print("*** Failure in package configuration")
+
     # Check tarball
     print("Check tarball")
     rc = os.system('make distcheck%s' % verbosity)
@@ -580,14 +585,12 @@ def release_menu(branch=&#39;release&#39;):
     # Step 6: Build tarball
     print("")
     if confirm("Step 6: Build tarball?"):
-        folder = "gammalib-%s" % get_current_version()
-        build_tarball(branch, folder)
+        build_tarball()
     # Step 7: Check tarball
     print("")
     if confirm("Step 7: Check tarball?"):
-        filename = "gammalib-%s.tar.gz" % get_current_version()
-        check_tarball(filename)
+        check_tarball()
     # Print separator
     print("")
@@ -709,13 +712,10 @@ if __name__ == &#39;__main__&#39;:
             commit('')
             print('')
         elif choice == '5':
-            branch = commands.getoutput('git rev-parse --abbrev-ref HEAD')
-            folder = "gammalib-%s" % get_current_version()
-            build_tarball(branch, folder)
+            build_tarball()
             print('')
         elif choice == '6':
-            filename = "gammalib-%s.tar.gz" % get_current_version()
-            check_tarball(filename)
+            check_tarball()
             print('')
         elif choice == 'q':
             break