[commit] r1996 - trunk/Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Mon Aug  6 15:22:01 2012
New Revision: 1996

Log:
Compile DsmlGenerator under msbuild64

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

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Mon Aug  6 13:15:46 2012	(r1995)
+++ trunk/Install/Build/build.py	Mon Aug  6 15:22:01 2012	(r1996)
@@ -187,7 +187,7 @@
     tools.build_VS( sln_file, "Release" )
 
     sln_file = os.path.join(GME_ROOT, "SDK", "DotNet", "DsmlGenerator", "DsmlGenerator.sln")
-    tools.build_VS(sln_file, "Release", arch='Any CPU')
+    tools.build_VS(sln_file, "Release", arch='Any CPU', msbuild=(prefs['arch'] == 'x64' and tools.MSBUILD.replace('Framework', 'Framework64') or tools.MSBUILD))
     if prefs['arch'] == 'x64':
         tools.system([r'%windir%\Microsoft.NET\Framework64\v4.0.30319\RegAsm.exe', '/codebase',
                       os.path.join(GME_ROOT, 'SDK', 'DotNet', 'DsmlGenerator', 'CSharpDsmlGenerator', 'bin', 'Release', 'CSharpDSMLGenerator.dll')])

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Mon Aug  6 13:15:46 2012	(r1995)
+++ trunk/Install/Build/tools.py	Mon Aug  6 15:22:01 2012	(r1996)
@@ -110,7 +110,7 @@
     toolmsg("Trying to create VisualStudio.DTE object")
     win32com.client.Dispatch("VisualStudio.DTE.10.0")
 
-def build_VS(sln_path, config_name, arch=None):
+def build_VS(sln_path, config_name, arch=None, msbuild=MSBUILD):
     """
     Builds a Microsoft Visual Studio 2010 project or entire solution.
     It cleans the project/solution before building it if the global 'clean' preference
@@ -127,7 +127,7 @@
     import subprocess
     # , '/fl', '/flp:Verbosity=diagnostic'
     # , '/m'
-    args = [MSBUILD, sln_path, '/t:' + ("Clean;" * prefs['clean']) + 'Build', '/p:Configuration=' + config_name + (';Platform=x64' if arch == 'x64' else '') ]
+    args = [msbuild, sln_path, '/t:' + ("Clean;" * prefs['clean']) + 'Build', '/p:Configuration=' + config_name + (';Platform=x64' if arch == 'x64' else '') ]
     with open(os.devnull, "w") as nulfp:
         # n.b. stderr=subprocess.STDOUT fails mysteriously
         import sys