[mapguide-commits] r8025 - in trunk/Tools/JenkinsCI/home/slave_win/jobs: MapGuide Open Source 2.5 x64 MapGuide Open Source 2.5 x86 MapGuide Open Source x64 MapGuide Open Source x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-04-09 08:44:36 -0700 (Wed, 09 Apr 2014)
New Revision: 8025

Modified:
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml
Log:
Use msbuild 4.0 for MgInstantSetup

Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml	2014-04-09 15:40:32 UTC (rev 8024)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml	2014-04-09 15:44:36 UTC (rev 8025)
@@ -82,7 +82,7 @@
 call "%WINDOWS_SDK_71_ROOT%\Bin\SetEnv.cmd" /release /x64
 
 REM Sigh! We can't seem to reference this from Jenkins
-SET MSBUILD_NET35=C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
 
 SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
 SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
@@ -281,7 +281,7 @@
 echo [build]: MgInstantSetup
 pushd %INSTANT_SETUP_SRC%
 SET BUILD_ACTION=Building MgInstantSetup
-%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+%MSBUILD_NET40% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
 if "%errorlevel%"=="1" goto error
 popd
 

Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml	2014-04-09 15:40:32 UTC (rev 8024)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml	2014-04-09 15:44:36 UTC (rev 8025)
@@ -82,7 +82,7 @@
 call "%WINDOWS_SDK_71_ROOT%\Bin\SetEnv.cmd" /release /x86
 
 REM Sigh! We can't seem to reference this from Jenkins
-SET MSBUILD_NET35=C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
 
 SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
 SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
@@ -281,7 +281,7 @@
 echo [build]: MgInstantSetup
 pushd %INSTANT_SETUP_SRC%
 SET BUILD_ACTION=Building MgInstantSetup
-%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+%MSBUILD_NET40% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
 if "%errorlevel%"=="1" goto error
 popd
 

Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml	2014-04-09 15:40:32 UTC (rev 8024)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml	2014-04-09 15:44:36 UTC (rev 8025)
@@ -92,7 +92,7 @@
 call %ACTIVEPATHCHECK%\vcvarsall.bat x86_amd64
 
 REM Sigh! We can't seem to reference this from Jenkins
-SET MSBUILD_NET35=C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
 
 SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
 SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
@@ -278,7 +278,7 @@
 echo [build]: MgInstantSetup
 pushd %INSTANT_SETUP_SRC%
 SET BUILD_ACTION=Building MgInstantSetup
-%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+%MSBUILD_NET40% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
 if "%errorlevel%"=="1" goto error
 popd
 

Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml	2014-04-09 15:40:32 UTC (rev 8024)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml	2014-04-09 15:44:36 UTC (rev 8025)
@@ -91,7 +91,7 @@
 call %ACTIVEPATHCHECK%\vcvarsall.bat x86
 
 REM Sigh! We can't seem to reference this from Jenkins
-SET MSBUILD_NET35=C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
 
 SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
 SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
@@ -277,7 +277,7 @@
 echo [build]: MgInstantSetup
 pushd %INSTANT_SETUP_SRC%
 SET BUILD_ACTION=Building MgInstantSetup
-%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+%MSBUILD_NET40% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
 if "%errorlevel%"=="1" goto error
 popd