[Mobies-commit] [commit] r3580 - in UDM/trunk: . InnoSetup

ksmyth at redhat1.isis.vanderbilt.edu ksmyth at redhat1.isis.vanderbilt.edu
Tue Nov 30 15:57:56 CST 2010 

Author: ksmyth
Date: Tue Nov 30 15:57:56 2010
New Revision: 3580

Log:
merge from https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/A3_2_7

Modified:
   UDM/trunk/   (props changed)
   UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
   UDM/trunk/UDM_Release_Howto.txt

Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Tue Nov 30 15:53:56 2010	(r3579)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Tue Nov 30 15:57:56 2010	(r3580)
@@ -87,7 +87,7 @@
 Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\bin\*; DestDir: {app}\3rdparty\xalan-c_1_11_0\bin; Excludes: ".svn,*.pdb"; Components: Core; Flags: ignoreversion
 Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\include\*; DestDir: {app}\3rdparty\xalan-c_1_11_0\include; Excludes: .svn; Components: Full3rdParty; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: {#UDM3rdPartyPath}\xalan-c_1_11_0\lib\*; DestDir: {app}\3rdparty\xalan-c_1_11_0\lib; Excludes: .svn; Components: Core; Flags: ignoreversion
-Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\bin\*; DestDir: {app}\3rdparty\xerces-c_2_8_0\bin; Excludes: .svn; Components: Core; Flags: ignoreversion
+Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\bin\*; DestDir: {app}\3rdparty\xerces-c_2_8_0\bin; Excludes: ".svn,*.pdb"; Components: Core; Flags: ignoreversion
 Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\include\*; DestDir: {app}\3rdparty\xerces-c_2_8_0\include; Excludes: .svn; Components: Full3rdParty; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: {#UDM3rdPartyPath}\xerces-c_2_8_0\lib\*; DestDir: {app}\3rdparty\xerces-c_2_8_0\lib; Excludes: .svn; Components: Core; Flags: ignoreversion
 Source: {#UDM3rdPartyPath}\zlib\license.txt; DestDir: {app}\3rdparty\zlib; Components: Core; Flags: ignoreversion
@@ -104,7 +104,7 @@
 Source: {#UDMPATH}\Build\Win32\VC9\Debug\{#UDMDLLD}; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Release\GmeOclExprChecker.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion regserver
 Source: {#UDMPATH}\Build\Win32\VC9\Release\UML2XML.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion regserver
-Source: {#GREATPATH}\bin\MetaGME2Uml.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion regserver
+Source: {#GREATPATH}\bin_vs9\MetaGME2Uml.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion regserver
 Source: {#UDMPATH}\Build\Win32\VC9\Release\Udm.exe; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Release\UdmBackendDump.exe; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC9\Release\UdmCopy.exe; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
@@ -120,8 +120,8 @@
 ;Source: {#UDMPATH}\Build\Win32\VC10\Release\UdmCliBridge.dll; DestDir: {app}\bin; Components: Core; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Release\udm.pyd; DestDir: {app}\bin; Components: Python; Flags: ignoreversion
 Source: {#UDMPATH}\Build\Win32\VC10\Debug\udmd.pyd; DestDir: {app}\bin; Components: Python; Flags: ignoreversion
-; c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild /t:Build /p:Configuration=Release27 Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj
 Source: {#UDMPATH}\Build\Win32\VC10\Release27\udm27.pyd; DestDir: {app}\bin; Components: Python; Flags: ignoreversion
+Source: {#UDMPATH}\bin\boost_python-vc100-mt-1_44.dll; DestDir: {app}\bin; Components: Python; Flags: ignoreversion
 Source: {#UDMPATH}\judm\build\build_win\judm\judm.jar; DestDir: {app}\bin; Components: Java; Flags: ignoreversion
 ;Udm Doc folder
 Source: {#UDMPATH}\doc\UDMAPI.pdf; DestDir: {app}\doc; Flags: ignoreversion; Components: Core

Modified: UDM/trunk/UDM_Release_Howto.txt
==============================================================================
--- UDM/trunk/UDM_Release_Howto.txt	Tue Nov 30 15:53:56 2010	(r3579)
+++ UDM/trunk/UDM_Release_Howto.txt	Tue Nov 30 15:57:56 2010	(r3580)
@@ -36,13 +36,13 @@
 set Path=%UDM_3RDPARTY_PATH%\apache-ant-1.7.1\bin;%PATH%
 set ANT_HOME=
 set ANT_PATH=
-%UDM_3RDPARTY_PATH%\apache-ant-1.7.1\bin\ant
+"%UDM_3RDPARTY_PATH%"\apache-ant-1.7.1\bin\ant
 
 rem ------------------------
-rem new VS9 cmd prompt
-rem Building GReAT is a requirement for a Udm release!
-devenv /build DebugVS9   /project "MetaGME2UML Interpreter" "%GREAT_PATH%\GReATVS2010.sln"
-devenv /build ReleaseVS9 /project "MetaGME2UML Interpreter" "%GREAT_PATH%\GReATVS2010.sln"
+rem new VS10 cmd prompt
+rem Building MetaGME2UML is a requirement for a Udm release
+set PATH=%UDM_PATH%\bin;%PATH%
+msbuild "%GREAT_PATH%\Tools\MetaGME2UMX\MetaGME2UMX Interpreters\MetaGME2UML_interpreterVS2010.vcxproj" /t:Rebuild /p:Configuration=ReleaseVS9
 
 
 rem ------------------------
@@ -52,23 +52,25 @@
 set JDK_PATH=C:\Program Files\Java\jdk1.5.0_22
 msbuild "%UDM_PATH%\Projects\Win32\VC10\src\UdmDll\UdmDll.vcxproj" /t:Rebuild /p:Configuration=Debug
 msbuild "%UDM_PATH%\Projects\Win32\VC10\src\UdmDll\UdmDll.vcxproj" /t:Rebuild /p:Configuration=Release
+msbuild "%UDM_PATH%\Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" /t:Rebuild /p:Configuration=Release27 
+msbuild "%UDM_PATH%\Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" /t:Rebuild /p:Configuration=Debug
+msbuild "%UDM_PATH%\Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj" /t:Rebuild /p:Configuration=Release
 
+"\Program Files\Debugging Tools for Windows (x86)\symstore.exe" add /r /f "%UDM_PATH%" /s \\kms1\symbols /t Udm /v "3.2.7"
+"\Program Files\Debugging Tools for Windows (x86)\symstore.exe" add /r /f "%GREAT_PATH%" /s \\kms1\symbols /t UdmGReAT /v "3.2.7"
 
-"\Program Files\Debugging Tools for Windows (x86)\symstore.exe" add /r /f "%UDM_PATH%" /s \\kms1\symbols /t Udm /v "3.2.5"
-"\Program Files\Debugging Tools for Windows (x86)\symstore.exe" add /r /f "%GREAT_PATH%" /s \\kms1\symbols /t UdmGReAT /v "3.2.5"
-
-svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/A3_2_5 Udm_source_r3.2.5
+svn export https://svn.isis.vanderbilt.edu/MoBIES/UDM/tags/A3_2_7 Udm_source_r3.2.7
 # run InnoSetup on %UDM_PATH%\InnoSetup\
 # rename InnoSetup output UDM_r3_2_5.exe
 # test installer http://kms1/svn/installs/ vm_installs_test.py secrets-installtest2.py
 # ------------------------
 # bash
-# zip Udm_source_r3.2.5/
-cp Udm_source_r3.2.5/releaseinfo.txt UDM_Release_Notes.txt 
+/c/Program\ Files/7-Zip/7z.exe a -r Udm_source_r3.2.7.zip Udm_source_r3.2.7/
+cp Udm_source_r3.2.7/releaseinfo.txt UDM_Release_Notes.txt 
 
-ssh ksmyth at repo.isis.vanderbilt.edu mkdir /project/www/Download/UDM/3.2.5/
-scp UDM_Release_Notes.txt UDM_r3_2_5.exe Udm_source_r3.2.5.zip ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.5/
-ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/UDM/3.2.5/
+ssh ksmyth at repo.isis.vanderbilt.edu mkdir /project/www/Download/UDM/3.2.7/
+scp UDM_Release_Notes.txt UDM_r3_2_7.exe Udm_source_r3.2.7.zip ksmyth at repo.isis.vanderbilt.edu:/project/www/Download/UDM/3.2.7/
+ssh ksmyth at repo.isis.vanderbilt.edu chmod -R a+r /project/www/Download/UDM/3.2.7/
 
 # For GReAT release:
 # export

More information about the Mobies-commit mailing list