[commit] r2077 - trunk/Install/Build

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Sep 28 08:27:44 2012
New Revision: 2077

Log:
Fix x64 only build: need Core.dll for CoreCollectionHandler if we are to run the tests under 32bit Python.exe

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

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Sep 28 07:46:30 2012	(r2076)
+++ trunk/Install/Build/build.py	Fri Sep 28 08:27:44 2012	(r2077)
@@ -97,6 +97,11 @@
 
 def compile_GME():
     "Compile GME core components"
+    if prefs['arch'] == 'x64':
+        # To use 32bit Python.exe for the tests, 32bit CoreCollectionHandler must be registered
+        sln_file = os.path.join(GME_ROOT, "GME", "GME.sln")
+        tools.build_VS(sln_file, 'Release', arch='Win32', target='Core')
+        tools.system(['regsvr32', '/s', os.path.join(GME_ROOT, "GME", "Release", "Core.dll")])
     sln_file = os.path.join(GME_ROOT, "GME", "GME.sln")
     tools.build_VS( sln_file, "Release" )
     sln_file = os.path.join(GME_ROOT, "GME", "GMEDecorators.sln")

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Fri Sep 28 07:46:30 2012	(r2076)
+++ trunk/Install/Build/tools.py	Fri Sep 28 08:27:44 2012	(r2077)
@@ -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, msbuild=MSBUILD):
+def build_VS(sln_path, config_name, arch=None, msbuild=MSBUILD, target=None):
     """
     Builds a Microsoft Visual Studio 2010 project or entire solution.
     It cleans the project/solution before building it if the global 'clean' preference
@@ -123,11 +123,12 @@
     msg += "Compiling " + sln_path + "(" + config_name + ") "
     toolmsg(msg)
     arch = arch or prefs['arch']
+    target = target or ("Clean;" * prefs['clean']) + 'Build'
 
     import subprocess
     # , '/fl', '/flp:Verbosity=diagnostic'
     # , '/m'
-    args = [msbuild, sln_path, '/m', '/t:' + ("Clean;" * prefs['clean']) + 'Build', 
+    args = [msbuild, sln_path, '/m', '/t:' + target, 
          '/p:VisualStudioVersion=%s.0;PlatformToolset=v%s0;Configuration=%s' % (prefs['toolset'], prefs['toolset'], config_name) +
         (';Platform=x64' if arch == 'x64' else '') ]
     with open(os.devnull, "w") as nulfp: