[commit] r1611 - trunk/Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Oct 12 12:48:00 2011
New Revision: 1611

Log:
Build GME x64

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

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Wed Oct 12 12:47:48 2011	(r1610)
+++ trunk/Install/Build/build.py	Wed Oct 12 12:48:00 2011	(r1611)
@@ -288,6 +288,7 @@
   -V, --version=MAJOR.MINOR.PATCHLEVEL
                       set build version (default: %d.%d.%d)
 
+  -a, --arch=ARCH     set architecture (x64 or x86)
 \tBuild steps:
 
 \t%s
@@ -303,10 +304,10 @@
        )
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], 'hvcs:e:i:x:V:',
+    opts, args = getopt.getopt(sys.argv[1:], 'hvcs:e:i:x:V:a:',
                                ["help", "verbose", "clean",
                                 "start=", "end=", "include=", "exclude=",
-                                "version="])
+                                "version=", "arch="])
     include_steps = []
     exclude_steps = []
     if args:
@@ -337,6 +338,8 @@
             prefs["version_major"] = int(M)
             prefs["version_minor"] = int(m)
             prefs["version_patch"] = int(p)
+        if opt in ("-a", "--arch"):
+            prefs["arch"] = val
             
 except (getopt.GetoptError, ValueError, AttributeError), e:
     print e
@@ -347,7 +350,7 @@
                                    str(prefs["version_minor"]),
                                    str(prefs["version_patch"])])
 
-print "Building GME version " + prefs["version_string"]
+print "Building GME version " + prefs["version_string"] + " " + prefs["arch"]
 
 try:
     for i in range(len(build_steps)):

Modified: trunk/Install/Build/prefs.py
==============================================================================
--- trunk/Install/Build/prefs.py	Wed Oct 12 12:47:48 2011	(r1610)
+++ trunk/Install/Build/prefs.py	Wed Oct 12 12:48:00 2011	(r1611)
@@ -16,5 +16,6 @@
 	"verbose" : False,
 	"version_major" : (time.localtime()[0] - 2000),
 	"version_minor" : time.localtime()[1],
-	"version_patch" : time.localtime()[2]
+	"version_patch" : time.localtime()[2],
+	"arch" : "x86",
 	}
\ No newline at end of file

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Wed Oct 12 12:47:48 2011	(r1610)
+++ trunk/Install/Build/tools.py	Wed Oct 12 12:48:00 2011	(r1611)
@@ -113,7 +113,7 @@
 
     import subprocess
     # , '/fl', '/flp:Verbosity=diagnostic'
-    args = ['msbuild', sln_path, '/t:' + ("Clean;" * prefs['clean']) + 'Build', '/p:Configuration=' + config_name]
+    args = ['msbuild', sln_path, '/t:' + ("Clean;" * prefs['clean']) + 'Build', '/p:Configuration=' + config_name + (';Platform=x64' if prefs['arch'] == 'x64' else '') ]
     with open(os.devnull, "w") as nulfp:
         # n.b. stderr=subprocess.STDOUT fails mysteriously
         import sys