[mapguide-commits] r6455 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jan 27 01:20:11 EST 2012
Author: jng
Date: 2012-01-26 22:20:11 -0800 (Thu, 26 Jan 2012)
New Revision: 6455
Modified:
trunk/MgDev/build.bat
trunk/MgDev/build64.bat
trunk/MgDev/setenvironment.bat
trunk/MgDev/setenvironment64.bat
Log:
#1930: Add VC10 compilation support to build.bat and build64.bat
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2012-01-27 06:01:58 UTC (rev 6454)
+++ trunk/MgDev/build.bat 2012-01-27 06:20:11 UTC (rev 6455)
@@ -43,6 +43,15 @@
rem Please note that -a=install does nothing if -w=oem
rem ==================================================
+rem Update solution suffix if using VC10 compiler.
+rem NOTE: VS10 solution files are suffixed with _VS2010
+rem which is why we can do it like this
+rem ==================================================
+
+SET VS_SLN_SUFFIX=
+IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
+
+rem ==================================================
rem Parameter Handling
rem ==================================================
@@ -152,6 +161,11 @@
echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
echo Deployment Directory for Web: %MG_OUTPUT_WEB%
echo CPU cores: %CPU_CORES%
+IF "%VC_COMPILER_VERSION%" == "10" (
+echo Using VC10 compiler
+) ELSE (
+echo Using VC9 compiler
+)
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -166,19 +180,23 @@
:clean_oem
echo [clean]: Clean Oem
-%MSBUILD_CLEAN% %MG_OEM%\Oem.sln
+%MSBUILD_CLEAN% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
echo [clean]: Clean Oem - CS-Map
+IF "%VC_COMPILER_VERSION%" == "10" (
+%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC100\OpenSource.sln
+) ELSE (
%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
+)
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_server
echo [clean]: Clean Server
-%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
+%MSBUILD_CLEAN% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_web
echo [clean]: Clean Web
-%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier.sln
+%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
echo [clean]: Clean fusion
%ANT% clean -f %MG_OEM%\fusion\build.xml
if not "%TYPECOMPONENT%"=="all" goto quit
@@ -207,11 +225,15 @@
:build_oem
echo [build]: Building Oem
-%MSBUILD% %MG_OEM%\Oem.sln
+%MSBUILD% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
rem CsMap is not in Oem.sln, so we need to build that separately
echo [build]: Building Oem - CSMap
+IF "%VC_COMPILER_VERSION%" == "10" (
+%MSBUILD% %MG_OEM%\CsMap\VC100\OpenSource.sln
+) ELSE (
%MSBUILD% %MG_OEM%\CsMap\VC90\OpenSource.sln
+)
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -220,7 +242,7 @@
:build_server
echo [build]: Building Server
-%MSBUILD% %MG_SERVER%\Server.sln
+%MSBUILD% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -229,7 +251,7 @@
:build_web
echo [build]: Building Web Tier
-%MSBUILD% %MG_WEB_SRC%\WebTier.sln
+%MSBUILD% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
Modified: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat 2012-01-27 06:01:58 UTC (rev 6454)
+++ trunk/MgDev/build64.bat 2012-01-27 06:20:11 UTC (rev 6455)
@@ -43,6 +43,15 @@
rem Please note that -a=install does nothing if -w=oem
rem ==================================================
+rem Update solution suffix if using VC10 compiler.
+rem NOTE: VS10 solution files are suffixed with _VS2010
+rem which is why we can do it like this
+rem ==================================================
+
+SET VS_SLN_SUFFIX=
+IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
+
+rem ==================================================
rem Parameter Handling
rem ==================================================
@@ -175,6 +184,11 @@
echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
echo Deployment Directory for Web: %MG_OUTPUT_WEB%
echo CPU cores: %CPU_CORES%
+IF "%VC_COMPILER_VERSION%" == "10" (
+echo Using VC10 compiler
+) ELSE (
+echo Using VC9 compiler
+)
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -189,19 +203,23 @@
:clean_oem
echo [clean]: Clean Oem
-%MSBUILD_CLEAN% %MG_OEM%\Oem.sln
+%MSBUILD_CLEAN% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
echo [clean]: Clean Oem - CS-Map
+IF "%VC_COMPILER_VERSION%" == "10" (
+%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC100\OpenSource.sln
+) ELSE (
%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
+)
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_server
echo [clean]: Clean Server
-%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
+%MSBUILD_CLEAN% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_web
echo [clean]: Clean Web
-%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier.sln
+%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
echo [clean]: Clean fusion
%ANT% clean -f %MG_OEM%\fusion\build.xml
if not "%TYPECOMPONENT%"=="all" goto quit
@@ -230,11 +248,15 @@
:build_oem
echo [build]: Building Oem
-%MSBUILD% %MG_OEM%\Oem.sln
+%MSBUILD% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
rem CsMap is not in Oem.sln, so we need to build that separately
echo [build]: Building Oem - CSMap
+IF "%VC_COMPILER_VERSION%" == "10" (
+%MSBUILD% %MG_OEM%\CsMap\VC100\OpenSource.sln
+) ELSE (
%MSBUILD% %MG_OEM%\CsMap\VC90\OpenSource.sln
+)
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="common" goto quit
@@ -244,7 +266,7 @@
:build_server
echo [build]: Building Server
-%MSBUILD% %MG_SERVER%\Server.sln
+%MSBUILD% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -253,7 +275,7 @@
:build_web
echo [build]: Building Web Tier
-%MSBUILD% %MG_WEB_SRC%\WebTier.sln
+%MSBUILD% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat 2012-01-27 06:01:58 UTC (rev 6454)
+++ trunk/MgDev/setenvironment.bat 2012-01-27 06:20:11 UTC (rev 6455)
@@ -1,4 +1,15 @@
+ at echo off
rem ==================================================
+rem setenvironment.bat
+rem
+rem Sets the required environment variables for the
+rem build.bat script
+rem
+rem Compiler defaults to vc9.0. To use the vc10
+rem compiler, call setenvironment.bat like so:
+rem
+rem setenvironment.bat vc10
+rem ==================================================
rem Top-level vars
rem ==================================================
SET OLDPATH=%PATH%
@@ -6,6 +17,8 @@
SET TYPEBUILD=Release
SET CONFIGURATION=Release
SET TYPECOMPONENT=all
+SET VC_COMPILER_VERSION=9
+IF "%1" == "vc10" SET VC_COMPILER_VERSION=10
rem ==================================================
rem MapGuide vars
rem ==================================================
@@ -58,7 +71,7 @@
rem Uncomment the line below to enable msbuild logging
rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:q
+SET MSBUILD_VERBOSITY=/v:n
rem ==================================================
rem Command aliases
Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat 2012-01-27 06:01:58 UTC (rev 6454)
+++ trunk/MgDev/setenvironment64.bat 2012-01-27 06:20:11 UTC (rev 6455)
@@ -1,5 +1,15 @@
@echo off
rem ==================================================
+rem setenvironment64.bat
+rem
+rem Sets the required environment variables for the
+rem build.bat script
+rem
+rem Compiler defaults to vc9.0. To use the vc10
+rem compiler, call setenvironment.bat like so:
+rem
+rem setenvironment64.bat vc10
+rem ==================================================
rem Top-level vars
rem ==================================================
SET OLDPATH=%PATH%
@@ -8,7 +18,8 @@
SET CONFIGURATION=Release
SET PLATFORM=x64
SET TYPECOMPONENT=all
-
+SET VC_COMPILER_VERSION=9
+IF "%1" == "vc10" SET VC_COMPILER_VERSION=10
rem ==================================================
rem MapGuide vars
rem ==================================================
More information about the mapguide-commits
mailing list