[commit] r1724 - trunk/Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Dec  2 15:23:51 2011
New Revision: 1724

Log:
Move VERSIONSTR so build.py -s 12 -e 12 works

Modified:
   trunk/Install/Build/build.py
   trunk/Install/Build/tools.py

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Dec  2 12:46:47 2011	(r1723)
+++ trunk/Install/Build/build.py	Fri Dec  2 15:23:51 2011	(r1724)
@@ -212,7 +212,6 @@
     f = open(os.path.join(GME_ROOT, "Install", "GME_dyn.wxi"), 'w')
     print >> f, "<!-- DO NOT EDIT THIS FILE. WILL BE REGENERATED BY THE BUILD SCRIPTS -->"
     print >> f, "<Include>"
-    print >> f, "   <?define VERSIONSTR='%s' ?>" % (prefs["version_string"])
     print >> f, "   <?define GUIDSTRMETAGME='%s' ?>" % (tools.query_GUID(mta_for_xmp(METAGME_XMP)))
     print >> f, "   <?define GUIDSTRHFSM='%s' ?>" % (tools.query_GUID(mta_for_xmp(HFSM_XMP)))
     print >> f, "   <?define GUIDSTRSF='%s' ?>" % (tools.query_GUID(mta_for_xmp(SF_XMP)))

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Fri Dec  2 12:46:47 2011	(r1723)
+++ trunk/Install/Build/tools.py	Fri Dec  2 15:23:51 2011	(r1724)
@@ -201,7 +201,7 @@
     exepath = WIX_CANDLE_PRG
     if 'WIX' in os.environ.keys():
         exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
-    cmd_line = [exepath] + WIX_CANDLE_ARG.split() + ['-arch', prefs['arch'], '-out', _get_wixobj(file), file]
+    cmd_line = [exepath] + WIX_CANDLE_ARG.split() + ['-dVERSIONSTR=' + prefs['version_string'], '-arch', prefs['arch'], '-out', _get_wixobj(file), file]
     system(cmd_line, os.path.dirname(file))
 
 def build_WiX(wix_files):