[mapguide-commits] r7710 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-08-01 07:55:20 -0700 (Thu, 01 Aug 2013)
New Revision: 7710

Modified:
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
#2318: Because Microsoft were so clever to use "Win32" as the 32-bit platform name for C++ projects instead of "x86", we need to use a separate alias of msbuild when building solutions that do not contain C++ projects (ie. The Wix installer). Only applies for 32-bit builds, but both setenvironment.bat and setenvironment64.bat have been modified for consistency.

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2013-08-01 01:30:27 UTC (rev 7709)
+++ trunk/MgDev/setenvironment.bat	2013-08-01 14:55:20 UTC (rev 7710)
@@ -106,7 +106,9 @@
 SET XCOPY=xcopy /E /Y /I /Q /H
 SET XCOPY_SINGLE=xcopy /Y /I /Q
 SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
+SET MSBUILD_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
 SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
+SET MSBUILD_CLEAN_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% /t:Clean %MSBUILD_VERBOSITY%
 SET ANT=ant
 
 echo ======== Environment Variable Summary =============

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2013-08-01 01:30:27 UTC (rev 7709)
+++ trunk/MgDev/setenvironment64.bat	2013-08-01 14:55:20 UTC (rev 7710)
@@ -112,7 +112,9 @@
 SET XCOPY=xcopy /E /Y /I /Q /H
 SET XCOPY_SINGLE=xcopy /Y /I /Q
 SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
+SET MSBUILD_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
 SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
+SET MSBUILD_CLEAN_CLR=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM_CLR% /t:Clean %MSBUILD_VERBOSITY%
 SET ANT=ant
 
 echo ======== Environment Variable Summary =============