[Winmerge-svn] SF.net SVN: winmerge:[6114] trunk/Tools/Scripts/create_release.py

[<ki...@us...>]

Revision: 6114
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6114&view=rev
Author:   kimmov
Date:     2008-11-20 19:23:59 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
BuildScript: use the SetVersions.py script to set version numbers.

Modified Paths:
--------------
    trunk/Tools/Scripts/create_release.py

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2008-11-20 19:14:51 UTC (rev 6113)
+++ trunk/Tools/Scripts/create_release.py	2008-11-20 19:23:59 UTC (rev 6114)
@@ -64,6 +64,7 @@
 import sys
 import getopt
 import shutil
+import SetVersions
 
 def get_vs_ide_bin():
     """Gets a full path to the Visual Studio IDE executable to run."""
@@ -139,11 +140,17 @@
         return False
     return True
 
-def set_resource_version(version):
+def get_product_version(file):
+    """Get the product version number from config file."""
+
+    version = SetVersions.get_product_version(file)
+    return version
+
+def set_resource_version(file):
     """Sets the version number to the resource."""
 
     print 'Update version number to resource(s)...'
-    call(['cscript', 'Src/SetResourceVersions.wsf', version])
+    SetVersions.process_versions(file)
 
 def setup_translations():
     """Updates translation files by running scripts in Src/Languages."""
@@ -422,13 +429,14 @@
     print '    -v: n, --version= n set release version'
     print '    -c, --cleanup clean up build files (temp files, libraries, executables)'
     print '    -l, --libraries build libraries (expat, scew, pcre) only'
-    print '  For example: create_release -v: 2.7.7.1'
+    print '    -f:, --file= filename set the version number ini file'
+    print '  For example: create_release -f: versions.ini'
 
 def main(argv):
     version = '0.0.0.0'
     if len(argv) > 0:
-        opts, args = getopt.getopt(argv, "hclv:", [ "help", "cleanup", "libraries",
-                                                    "version="])
+        opts, args = getopt.getopt(argv, "hclv:f:", [ "help", "cleanup", "libraries",
+                                                    "version=", "file="])
         
         for opt, arg in opts:
             if opt in ("-h", "--help"):
@@ -444,6 +452,8 @@
             if opt in ("-l", "--libraries"):
                 build_libraries()
                 sys.exit()
+            if opt in ("-f", "--file"):
+                ver_file = arg
 
     # Check all required tools are found (script configuration)
     if check_tools() == False:
@@ -474,6 +484,12 @@
     if cleanup_build() == False:
         sys.exit()
 
+    if len(ver_file) > 0:
+        version_read = get_product_version(ver_file)
+        if len(version_read) > 0:
+          version = version_read
+        set_resource_version(ver_file)
+
     version_folder = 'WinMerge-' + version
     dist_folder = get_and_create_dist_folder(version_folder)
     if dist_folder == '':
@@ -481,7 +497,6 @@
     dist_src_folder = get_src_dist_folder(dist_folder, version_folder)
     svn_export(dist_src_folder)
 
-    set_resource_version(version)
     setup_translations()
 
     build_targets()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.