[mapguide-commits] r4685 - trunk/Installer/scripts

[svn_mapguide at osgeo.org]

Author: trevorwekel
Date: 2010-03-22 18:11:09 -0400 (Mon, 22 Mar 2010)
New Revision: 4685

Added:
   trunk/Installer/scripts/revnum.pl
Modified:
   trunk/Installer/scripts/buildmgx86.bat
Log:
Ticket #1295 Improve build scripts for 2.2 release cycle
Partial changeset number propagation for Windows Installer.  File versions on binaries still incorrect.


Modified: trunk/Installer/scripts/buildmgx86.bat
===================================================================
--- trunk/Installer/scripts/buildmgx86.bat	2010-03-22 21:30:08 UTC (rev 4684)
+++ trunk/Installer/scripts/buildmgx86.bat	2010-03-22 22:11:09 UTC (rev 4685)
@@ -13,9 +13,10 @@
 
 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
 
-rem TODO get build number from Subversion
+svn info svn://svn.bld.mgproto.net/mapguide/trunk/MgDev | perl revnum.pl > revision.txt
+set /p REVISION= < revision.txt
 
-svn export svn://svn.bld.mgproto.net/mapguide/trunk/MgDev %MGSOURCE%
+svn export -r %REVISION%  svn://svn.bld.mgproto.net/mapguide/trunk/MgDev %MGSOURCE%
 svn export svn://svn.bld.mgproto.net/metacrs/csmap/trunk/CsMapDev %MGSOURCE%\Oem\CsMap
 svn export svn://svn.bld.mgproto.net/fusion/trunk %MGSOURCE%\Oem\fusion
 svn export svn://svn.bld.mgproto.net/mapguide/trunk/Installer %MGINSTALL% 
@@ -44,6 +45,6 @@
 cd %MGINSTALL%
 call build.bat -source=%INSTALLROOT% -a=prepare
 call build.bat -source=%INSTALLROOT% -a=generate 
-call build.bat -source=%INSTALLROOT% -version=2.2.0.0 -name=MapGuideOpenSource-2.2.0-Beta1 -title="MapGuide Open Source 2.2 Beta 1"
+call build.bat -source=%INSTALLROOT% -version=2.2.0.%REVISION% -name=MapGuideOpenSource-2.2.0.%REVISION%-Beta1 -title="MapGuide Open Source 2.2 Beta 1"
 
 cd %STARTDIR%

Added: trunk/Installer/scripts/revnum.pl
===================================================================
--- trunk/Installer/scripts/revnum.pl	                        (rev 0)
+++ trunk/Installer/scripts/revnum.pl	2010-03-22 22:11:09 UTC (rev 4685)
@@ -0,0 +1,8 @@
+while (defined($line = <STDIN>))
+{
+   ($key,$value) = split(/: /,$line);
+   if ($key eq "Last Changed Rev")
+   {
+      print $value;
+   }
+}
\ No newline at end of file