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

[svn_mapguide at osgeo.org]

Author: trevorwekel
Date: 2010-09-29 15:59:03 +0000 (Wed, 29 Sep 2010)
New Revision: 5215

Modified:
   trunk/Installer/scripts/buildfdox64.bat
   trunk/Installer/scripts/buildfdox86.bat
   trunk/Installer/scripts/buildmgx64.bat
   trunk/Installer/scripts/buildmgx86.bat
Log:
Build script fixups for MapGuide 2.2 RC1 build


Modified: trunk/Installer/scripts/buildfdox64.bat
===================================================================
--- trunk/Installer/scripts/buildfdox64.bat	2010-09-29 13:29:11 UTC (rev 5214)
+++ trunk/Installer/scripts/buildfdox64.bat	2010-09-29 15:59:03 UTC (rev 5215)
@@ -2,18 +2,21 @@
 set FDOSOURCE=%BUILDROOT%\fdo
 set INSTALLROOT=%BUILDROOT%\install
 set PLATFORM=x64
+SET FDO_VERSION=5667
+SET PROVIDERS_VERSION=5667
 
 rmdir /S /Q %BUILDROOT%
 mkdir %INSTALLROOT%
 
 rem TODO get build number from Subversion
 
-svn export svn://svn.bld.mgproto.net/fdo/branches/3.5 %FDOSOURCE%
+svn export -r %FDO_VERSION% svn://bld.mgproto.net/fdo/branches/3.5 %FDOSOURCE%
 
 SET FDOMYSQL="c:\mysql-5.0.86-winx64"
 SET FDOORACLE="C:\instantclient_10_2-win-x86-64\sdk"
 
 cd %FDOSOURCE%
-call c:\scripts\setenvironment.bat x64
+rem x64 breaks boost from command line
+call c:\script\setenvironment.bat
 call build_thirdparty.bat -p=%PLATFORM% -a=buildinstall -o=%INSTALLROOT%
 call build.bat -p=%PLATFORM% -a=buildinstall -o=%INSTALLROOT%

Modified: trunk/Installer/scripts/buildfdox86.bat
===================================================================
--- trunk/Installer/scripts/buildfdox86.bat	2010-09-29 13:29:11 UTC (rev 5214)
+++ trunk/Installer/scripts/buildfdox86.bat	2010-09-29 15:59:03 UTC (rev 5215)
@@ -2,18 +2,20 @@
 set FDOSOURCE=%BUILDROOT%\fdo
 set INSTALLROOT=%BUILDROOT%\install
 set PLATFORM=Win32
+SET FDO_VERSION=5667
+SET PROVIDERS_VERSION=5667
 
 rmdir /S /Q %BUILDROOT%
 mkdir %INSTALLROOT%
 
 rem TODO get build number from Subversion
 
-svn export svn://svn.bld.mgproto.net/fdo/branches/3.5 %FDOSOURCE%
+svn export -r %FDO_VERSION% svn://svn.bld.mgproto.net/fdo/branches/3.5 %FDOSOURCE%
 
 SET FDOMYSQL=c:\mysql-5.0.86-win32
 SET FDOORACLE=C:\instantclient_10_2-win32\sdk
 
 cd %FDOSOURCE%
-call c:\scripts\setenvironment.bat
+call c:\script\setenvironment.bat
 call build_thirdparty.bat -p=%PLATFORM% -a=buildinstall -o=%INSTALLROOT%
 call build.bat  -p=%PLATFORM% -a=buildinstall -o=%INSTALLROOT%

Modified: trunk/Installer/scripts/buildmgx64.bat
===================================================================
--- trunk/Installer/scripts/buildmgx64.bat	2010-09-29 13:29:11 UTC (rev 5214)
+++ trunk/Installer/scripts/buildmgx64.bat	2010-09-29 15:59:03 UTC (rev 5215)
@@ -1,21 +1,21 @@
 SET BUILDROOT=c:\builds\mg22x64
-rem SET FDOBUILD=c:\builds\fdo35x64\install\Fdo
-SET FDOBUILD=c:\fdo64rc1
+SET FDOBUILD=c:\fdo64-5667
 SET MGSOURCE=%BUILDROOT%\mgdev
 SET MGINSTALL=%BUILDROOT%\installer
 SET INSTALLROOT=%MGSOURCE%\Release64
+SET SOLUTIONCONFIG="Release|x64"
 SET OEMFDO=%MGSOURCE%\Oem\FDO
 SET STARTDIR=%CD%
 
-rmdir /S /Q %MGSOURCE%
-rmdir /S /Q %MGINSTALL%
+rmdir /S /Q %BUILDROOT%
+rmdir /S /Q %INSTALLROOT%
 
 call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
 
 svn info svn://svn.bld.mgproto.net/mapguide/branches/2.2/MgDev | perl revnum.pl > revision.txt
 set /p REVISION= < revision.txt
 
-svn export -r %REVISION%  svn://svn.bld.mgproto.net/mapguide/branches/2.2/MgDev %MGSOURCE%
+svn export -r %REVISION% svn://svn.bld.mgproto.net/mapguide/branches/2.2/MgDev %MGSOURCE%
 svn export svn://svn.bld.mgproto.net/mapguide/trunk/Installer %MGINSTALL% 
 
 cd %MGSOURCE%
@@ -23,18 +23,29 @@
 
 
 mkdir %OEMFDO%\Bin\Release64
-mkdir %OEMFDO%\Bin\Lib64
-xcopy /Y /E %FDOBUILD%\Bin\* %OEMFDO%\Bin\Release64
+xcopy /Y /E /I %FDOBUILD%\Bin\* %OEMFDO%\Bin\Release64
 xcopy /Y /E /I %FDOBUILD%\Inc %OEMFDO%\Inc
 xcopy /Y /E /I %FDOBUILD%\Lib %OEMFDO%\Lib64
 
+cd %MGSOURCE%\Oem
+devenv oem.sln /build %SOLUTIONCONFIG%
+
+cd %MGSOURCE%\Oem\CsMap
+devenv OpenSource.sln /build %SOLUTIONCONFIG%
+
+cd %MGSOURCE%\Server
+devenv Server.sln /build %SOLUTIONCONFIG%
+
+cd %MGSOURCE%\Web\src
+devenv WebTier.sln /build %SOLUTIONCONFIG%
+
 cd %MGSOURCE%
 call build64.bat
 call build64.bat -a=install 
 
 cd %MGINSTALL%
 call build64.bat -source=%INSTALLROOT% -a=prepare
-call build64.bat -source=%INSTALLROOT% -a=generate 
-call build64.bat -source=%INSTALLROOT% -version=2.2.0.%REVISION% -name=MapGuideOpenSource-2.2.0.%REVISION%-Beta2-x64 -title="MapGuide Open Source 2.2 x64 Beta 2"
+call build64.bat -source=%INSTALLROOT% -a=generate
+call build64.bat -source=%INSTALLROOT% -version=2.2.0.%REVISION% -name=MapGuideOpenSource-2.2.0.%REVISION%-RC1-x64 -title="MapGuide Open Source 2.2 x64 RC1"
 
 cd %STARTDIR%

Modified: trunk/Installer/scripts/buildmgx86.bat
===================================================================
--- trunk/Installer/scripts/buildmgx86.bat	2010-09-29 13:29:11 UTC (rev 5214)
+++ trunk/Installer/scripts/buildmgx86.bat	2010-09-29 15:59:03 UTC (rev 5215)
@@ -1,6 +1,5 @@
 SET BUILDROOT=c:\builds\mg22win32
-rem SET FDOBUILD=c:\builds\fdo35win32\install\Fdo
-SET FDOBUILD=c:\fdo32rc1
+SET FDOBUILD=c:\fdo32-5667
 SET MGSOURCE=%BUILDROOT%\mgdev
 SET MGINSTALL=%BUILDROOT%\installer
 SET INSTALLROOT=%MGSOURCE%\Release
@@ -47,6 +46,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.%REVISION% -name=MapGuideOpenSource-2.2.0.%REVISION%-Beta2 -title="MapGuide Open Source 2.2 Beta 2"
+call build.bat -source=%INSTALLROOT% -version=2.2.0.%REVISION% -name=MapGuideOpenSource-2.2.0.%REVISION%-RC1 -title="MapGuide Open Source 2.2 RC1"
 
 cd %STARTDIR%