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

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-03-15 04:57:33 -0700 (Tue, 15 Mar 2016)
New Revision: 8888

Modified:
   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:
Update trunk build configs for MGOS to use MSVC 2015

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	2016-03-15 11:49:46 UTC (rev 8887)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml	2016-03-15 11:57:33 UTC (rev 8888)
@@ -30,7 +30,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MG_VER_MINOR</name>
           <description></description>
-          <defaultValue>0</defaultValue>
+          <defaultValue>1</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MG_VER_BUILD</name>
@@ -78,12 +78,12 @@
       <command>@echo off&#xd;
 &#xd;
 SET BUILD_ACTION=Setting Visual Studio env vars&#xd;
-SET VCBEXTENSION=_vs12&#xd;
-SET VC_COMPILER=vc110&#xd;
-SET ACTIVENAMECHECK="Microsoft Visual Studio 11"&#xd;
-SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 11.0\VC"&#xd;
+SET VCBEXTENSION=_vs14&#xd;
+SET VC_COMPILER=vc140&#xd;
+SET ACTIVENAMECHECK="Microsoft Visual Studio 14"&#xd;
+SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 14.0\VC"&#xd;
 if exist %ACTIVEPATHCHECK% goto VSExist&#xd;
-SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC"&#xd;
+SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"&#xd;
 if exist %ACTIVEPATHCHECK% goto VSExist&#xd;
 goto error&#xd;
 &#xd;

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	2016-03-15 11:49:46 UTC (rev 8887)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml	2016-03-15 11:57:33 UTC (rev 8888)
@@ -30,7 +30,7 @@
         <hudson.model.StringParameterDefinition>
           <name>MG_VER_MINOR</name>
           <description></description>
-          <defaultValue>0</defaultValue>
+          <defaultValue>1</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
           <name>MG_VER_BUILD</name>
@@ -78,12 +78,12 @@
       <command>@echo off&#xd;
 &#xd;
 SET BUILD_ACTION=Setting Visual Studio env vars&#xd;
-SET VCBEXTENSION=_vs12&#xd;
-SET VC_COMPILER=vc110&#xd;
-SET ACTIVENAMECHECK="Microsoft Visual Studio 11"&#xd;
-SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 11.0\VC"&#xd;
+SET VCBEXTENSION=_vs14&#xd;
+SET VC_COMPILER=vc140&#xd;
+SET ACTIVENAMECHECK="Microsoft Visual Studio 14"&#xd;
+SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 14.0\VC"&#xd;
 if exist %ACTIVEPATHCHECK% goto VSExist&#xd;
-SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC"&#xd;
+SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"&#xd;
 if exist %ACTIVEPATHCHECK% goto VSExist&#xd;
 goto error&#xd;
 &#xd;