[commit] r1666 - in trunk: GME Install/Build Paradigms/MetaGME

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Nov  4 15:51:23 2011
New Revision: 1666

Log:
Add x64 option to regrelease

Modified:
   trunk/GME/regrelease.bat
   trunk/Install/Build/build.py
   trunk/Paradigms/MetaGME/regrelease.bat

Modified: trunk/GME/regrelease.bat
==============================================================================
--- trunk/GME/regrelease.bat	Fri Nov  4 15:51:08 2011	(r1665)
+++ trunk/GME/regrelease.bat	Fri Nov  4 15:51:23 2011	(r1666)
@@ -7,78 +7,80 @@
 
 REM FIXME Do we need to regasm mgadotnetservices.dll?
 
+echo Registering %1
+
 echo Core.dll:
-regsvr32 /s "%~dp0Release\Core.dll"
+regsvr32 /s "%~dp0%1\Release\Core.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Meta.dll:
-regsvr32 /s "%~dp0Release\Meta.dll"
+regsvr32 /s "%~dp0%1\Release\Meta.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Mga.dll:
-regsvr32 /s "%~dp0Release\Mga.dll"
+regsvr32 /s "%~dp0%1\Release\Mga.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo MgaUtil.dll:
-regsvr32 /s "%~dp0Release\MgaUtil.dll"
+regsvr32 /s "%~dp0%1\Release\MgaUtil.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Parser.dll:
-regsvr32 /s "%~dp0Release\Parser.dll"
+regsvr32 /s "%~dp0%1\Release\Parser.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo ConstraintManager.dll:
-regsvr32 /s "%~dp0Release\ConstraintManager.dll"
+regsvr32 /s "%~dp0%1\Release\ConstraintManager.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo GMEActiveBrowser.ocx:
-regsvr32 /s "%~dp0Release\GMEActiveBrowser.ocx"
+regsvr32 /s "%~dp0%1\Release\GMEActiveBrowser.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo MgaDecorators.dll:
-regsvr32 /s "%~dp0Release\MgaDecorators.dll"
+regsvr32 /s "%~dp0%1\Release\MgaDecorators.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Annotator.dll:
-regsvr32 /s "%~dp0Release\Annotator.dll"
+regsvr32 /s "%~dp0%1\Release\Annotator.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo ObjectInspector.ocx:
-regsvr32 /s "%~dp0Release\ObjectInspector.ocx"
+regsvr32 /s "%~dp0%1\Release\ObjectInspector.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Search.ocx:
-regsvr32 /s "%~dp0Release\Search.ocx"
+regsvr32 /s "%~dp0%1\Release\Search.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo Console.ocx:
-regsvr32 /s "%~dp0Release\Console.ocx"
+regsvr32 /s "%~dp0%1\Release\Console.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo XmlBackEnd.dll:
-regsvr32 /s "%~dp0Release\XmlBackEnd.dll"
+regsvr32 /s "%~dp0%1\Release\XmlBackEnd.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo PartBrowser.ocx:
-regsvr32 /s "%~dp0Release\PartBrowser.ocx"
+regsvr32 /s "%~dp0%1\Release\PartBrowser.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo PanningView.ocx:
-regsvr32 /s "%~dp0Release\PanningView.ocx"
+regsvr32 /s "%~dp0%1\Release\PanningView.ocx"
 if errorlevel 1 goto errorlabel
 echo    OK
 

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Fri Nov  4 15:51:08 2011	(r1665)
+++ trunk/Install/Build/build.py	Fri Nov  4 15:51:23 2011	(r1666)
@@ -94,7 +94,7 @@
     sln_file = os.path.join(GME_ROOT, "GME", "GMEDecorators.sln");
     tools.build_VS( sln_file, "Release" )
     cmd_dir = os.path.join(GME_ROOT, "GME");
-    tools.system( "call regrelease.bat <NUL".split(), cmd_dir)
+    tools.system( ['call', 'regrelease.bat'] + (['x64'] if prefs['arch'] == 'x64' else []) + ['<NUL'], cmd_dir)
 
 
 def compile_meta():
@@ -102,7 +102,7 @@
     sln_file = os.path.join(GME_ROOT, "Paradigms", "MetaGME", "MetaGME.sln");
     tools.build_VS( sln_file, "Release" )
     cmd_dir = os.path.join(GME_ROOT, "Paradigms", "MetaGME");
-    tools.system( "call regrelease.bat <NUL".split(), cmd_dir)
+    tools.system( ['call', 'regrelease.bat'] + (['x64'] if prefs['arch'] == 'x64' else []) + ['<NUL'], cmd_dir)
 
         
 def compile_JBON():

Modified: trunk/Paradigms/MetaGME/regrelease.bat
==============================================================================
--- trunk/Paradigms/MetaGME/regrelease.bat	Fri Nov  4 15:51:08 2011	(r1665)
+++ trunk/Paradigms/MetaGME/regrelease.bat	Fri Nov  4 15:51:23 2011	(r1666)
@@ -5,23 +5,25 @@
 REM	Please consult with Peter before editing this file
 REM 
 
+echo Registering %1
+
 echo MetaDecorator.dll:
-regsvr32 /s "Release\MetaDecorator.dll"
+regsvr32 /s "%~dp0%1\Release\MetaDecorator.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo BonExtender.dll:
-regsvr32 /s "Release\BonExtender.dll"
+regsvr32 /s "%~dp0%1\Release\BonExtender.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo MetaInterpreter.dll:
-regsvr32 /s "Release\MetaInterpreter.dll"
+regsvr32 /s "%~dp0%1\Release\MetaInterpreter.dll"
 if errorlevel 1 goto errorlabel
 echo    OK
 
 echo NamespaceConfig.dll:
-regsvr32 /s "Release\NamespaceConfig.dll"
+regsvr32 /s "%~dp0%1\Release\NamespaceConfig.dll"
 if errorlevel 1 goto errorlabel
 echo    OK