[Mobies-commit] [commit] r4310 - in UDM/trunk: . scripts

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed Jul  9 13:37:16 2014
New Revision: 4310

Log:
Upgrade UdmSwig.dll in installer to VS2010

Added:
   UDM/trunk/scripts/vc10-env.bat
Modified:
   UDM/trunk/make.msbuild
   UDM/trunk/scripts/_run-ant-on-judm.bat
   UDM/trunk/scripts/run-ant-on-judm.bat

Modified: UDM/trunk/make.msbuild
==============================================================================
--- UDM/trunk/make.msbuild	Wed Jul  9 11:53:36 2014	(r4309)
+++ UDM/trunk/make.msbuild	Wed Jul  9 13:37:16 2014	(r4310)
@@ -58,7 +58,7 @@
   </Target>
   
   <Target Name="judm" DependsOnTargets="CheckEnv">
-    <Exec Command="call scripts\run-ant-on-judm.bat VC9 Release generate test" WorkingDirectory="$(MSBuildThisFileDirectory)"/>
+    <Exec Command="call scripts\run-ant-on-judm.bat VC10 Release generate test" WorkingDirectory="$(MSBuildThisFileDirectory)"/>
   </Target>
 
   <Target Name="TestPython">

Modified: UDM/trunk/scripts/_run-ant-on-judm.bat
==============================================================================
--- UDM/trunk/scripts/_run-ant-on-judm.bat	Wed Jul  9 11:53:36 2014	(r4309)
+++ UDM/trunk/scripts/_run-ant-on-judm.bat	Wed Jul  9 13:37:16 2014	(r4310)
@@ -28,7 +28,7 @@
 
 :start
 pushd %_UDM_PATH%\judm
-ant "-Dudm.bin.dir=%_UDM_PATH%\Build\Win32\%_VC%\%_UDM_BUILD%" %_CMD_LINE%
+ant "-Dudm.bin.dir=%_UDM_PATH%\bin" %_CMD_LINE%
 popd
 
 exit /b

Modified: UDM/trunk/scripts/run-ant-on-judm.bat
==============================================================================
--- UDM/trunk/scripts/run-ant-on-judm.bat	Wed Jul  9 11:53:36 2014	(r4309)
+++ UDM/trunk/scripts/run-ant-on-judm.bat	Wed Jul  9 13:37:16 2014	(r4310)
@@ -1,6 +1,6 @@
 @echo off
 
-if /i not "%1"=="VC9" goto :usage
+if /i not "%1"=="VC10" goto :usage
 if /i not "%2"=="Debug" if /i not "%2"=="Release" goto :usage
 
 rem Run ant
@@ -10,5 +10,5 @@
 
 :usage
 echo Runs ant on judm, with the specified UDM build
-echo Usage: %0 ^<VC9^> ^<Debug^|Release^> ^<parameters to ant^>
+echo Usage: %0 ^<VC10^> ^<Debug^|Release^> ^<parameters to ant^>
 exit /b

Added: UDM/trunk/scripts/vc10-env.bat
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ UDM/trunk/scripts/vc10-env.bat	Wed Jul  9 13:37:16 2014	(r4310)
@@ -0,0 +1,29 @@
+ at echo off
+
+: Read UDM_3RDPARTY_PATH and JAVA_HOME from script with local settings
+if exist "%~dp0"vc10-env-local.bat call "%~dp0"vc10-env-local.bat
+
+if not defined UDM_3RDPARTY_PATH echo Set UDM_3RDPARTY_PATH & exit /b 1
+if not defined JAVA_HOME echo Set JAVA_HOME & exit /b 1
+if not defined GME_ROOT echo Set GME_ROOT & exit /b 1
+
+if defined UDM_PATH goto :udm_path_set
+
+rem Determine UDM_PATH
+pushd %CD%
+rem cd to the parent directory of this script
+cd /d %~dp0..
+set UDM_PATH=%CD%
+popd
+
+:udm_path_set
+
+set PATH=%UDM_PATH%\bin;^
+%UDM_3RDPARTY_PATH%\cppunit-1.12.1\bin;^
+%UDM_3RDPARTY_PATH%\info-zip;^
+%UDM_3RDPARTY_PATH%\apache-ant-1.7.1\bin;^
+%PATH%
+
+set _CLASSPATH=%UDM_3RDPARTY_PATH%\junit\junit.jar;%UDM_3RDPARTY_PATH%\antlr-2.7.7\antlr.jar
+if defined CLASSPATH (set CLASSPATH=%_CLASSPATH%;%CLASSPATH%) else (set CLASSPATH=%_CLASSPATH%)
+