[mapguide-commits] r7536 - in trunk/Tools/JenkinsCI: . home/slave_win home/slave_win/jobs/FDO x64 home/slave_win/jobs/FDO x86 home/slave_win/jobs/Maestro 4.0.x home/slave_win/jobs/Maestro trunk home/slave_win/jobs/MapGuide Open Source x64 home/slave_win/jobs/MapGuide Open Source x86 home/slave_win/jobs/MgInstantSetup home/slave_win/jobs/mg-desktop-net40-vc10-x64 home/slave_win/jobs/mg-desktop-net40-vc10-x86 tools

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed May 29 12:34:53 PDT 2013 

Author: jng
Date: 2013-05-29 12:34:53 -0700 (Wed, 29 May 2013)
New Revision: 7536

Added:
   trunk/Tools/JenkinsCI/tools/
   trunk/Tools/JenkinsCI/tools/SetAssemblyVersion.exe
   trunk/Tools/JenkinsCI/tools/UpdateVersion.exe
   trunk/Tools/JenkinsCI/tools/fdo_enable_vcexpress64.bat
   trunk/Tools/JenkinsCI/tools/revnum.pl
Removed:
   trunk/Tools/JenkinsCI/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jenkins.xml
   trunk/Tools/JenkinsCI/jobs/
Modified:
   trunk/Tools/JenkinsCI/home/slave_win/
   trunk/Tools/JenkinsCI/home/slave_win/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.CVSSCM.xml
   trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.SubversionSCM.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MgInstantSetup/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/mg-desktop-net40-vc10-x64/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/mg-desktop-net40-vc10-x86/
   trunk/Tools/JenkinsCI/readme.txt
Log:
#2210: Re-org the jenkins configuration. We now version track the files and directories such that we can re-point JENKINS_HOME into it. This will dramatically simplify Jenkins setup for a fresh build environment.

Also check in commonly used tools and scripts that will be used by most Jenkins jobs

Deleted: trunk/Tools/JenkinsCI/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/config.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/config.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -1,45 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<hudson>
-  <disabledAdministrativeMonitors/>
-  <version>1.465</version>
-  <numExecutors>2</numExecutors>
-  <mode>NORMAL</mode>
-  <useSecurity>true</useSecurity>
-  <authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
-  <securityRealm class="hudson.security.SecurityRealm$None"/>
-  <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
-  <workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
-  <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
-  <jdks>
-    <jdk>
-      <name>JDK 6u33 x86</name>
-      <home>C:\Program Files (x86)\Java\jdk1.6.0_33</home>
-      <properties/>
-    </jdk>
-    <jdk>
-      <name>JDK 6u33 x64</name>
-      <home>C:\Program Files\Java\jdk1.6.0_33</home>
-      <properties/>
-    </jdk>
-  </jdks>
-  <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
-  <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
-  <clouds/>
-  <slaves/>
-  <quietPeriod>5</quietPeriod>
-  <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
-  <views>
-    <hudson.model.AllView>
-      <owner class="hudson" reference="../../.."/>
-      <name>All</name>
-      <filterExecutors>false</filterExecutors>
-      <filterQueue>false</filterQueue>
-      <properties class="hudson.model.View$PropertyList"/>
-    </hudson.model.AllView>
-  </views>
-  <primaryView>All</primaryView>
-  <slaveAgentPort>0</slaveAgentPort>
-  <label></label>
-  <nodeProperties/>
-  <globalNodeProperties/>
-</hudson>
\ No newline at end of file


Property changes on: trunk/Tools/JenkinsCI/home/slave_win
___________________________________________________________________
Added: svn:ignore
   + identity.key
plugins
secret.key
secret.key.not-so-secret
secrets
updates
war


Modified: trunk/Tools/JenkinsCI/home/slave_win/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/config.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/config.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -51,5 +51,27 @@
   <slaveAgentPort>0</slaveAgentPort>
   <label></label>
   <nodeProperties/>
-  <globalNodeProperties/>
+  <globalNodeProperties>
+    <hudson.slaves.EnvironmentVariablesNodeProperty>
+      <envVars serialization="custom">
+        <unserializable-parents/>
+        <tree-map>
+          <default>
+            <comparator class="hudson.util.CaseInsensitiveComparator"/>
+          </default>
+          <int>5</int>
+          <string>MG_BUILD_AREA</string>
+          <string>C:\working\build_area</string>
+          <string>MG_BUILD_ARTIFACT_PATH</string>
+          <string>C:\builds</string>
+          <string>MG_LIB_ROOT</string>
+          <string>C:\working\libs</string>
+          <string>MG_TOOL_PATH</string>
+          <string>C:\working\JenkinsCI</string>
+          <string>WINDOWS_SDK_71_ROOT</string>
+          <string>C:\Program Files\Microsoft SDKs\Windows\v7.1</string>
+        </tree-map>
+      </envVars>
+    </hudson.slaves.EnvironmentVariablesNodeProperty>
+  </globalNodeProperties>
 </hudson>
\ No newline at end of file

Modified: trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.CVSSCM.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.CVSSCM.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.CVSSCM.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -3,7 +3,7 @@
   <generation>1</generation>
   <compressionLevel>3</compressionLevel>
   <privateKeyLocation>C:\/.ssh/id_rsa</privateKeyLocation>
-  <privateKeyPassword>i5p9Nb3bU7LPIbGPeOhoEA==</privateKeyPassword>
+  <privateKeyPassword>UPk/of7GPKBpanq4xlQT3icsfYni+7d7z9HC4ddveYL2KZaLqMWcM6SfTU4jMrpt</privateKeyPassword>
   <knownHostsLocation>C:\/.ssh/known_hosts</knownHostsLocation>
   <authTokens/>
   <changelogEncoding>UTF-8</changelogEncoding>

Modified: trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.SubversionSCM.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.SubversionSCM.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/hudson.scm.SubversionSCM.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <hudson.scm.SubversionSCM_-DescriptorImpl plugin="subversion at 1.48">
-  <generation>1</generation>
+  <generation>5</generation>
   <credentials class="hashtable"/>
   <workspaceFormat>10</workspaceFormat>
   <validateRemoteUpToVar>false</validateRemoteUpToVar>

Deleted: trunk/Tools/JenkinsCI/home/slave_win/jenkins.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jenkins.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/jenkins.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -1,50 +0,0 @@
-<!--
-The MIT License
-
-Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--->
-
-<!--
-  Windows service definition for Jenkins
-
-  To uninstall, run "jenkins.exe stop" to stop the service, then "jenkins.exe uninstall" to uninstall the service.
-  Both commands don't produce any output if the execution is successful. 
--->
-<service>
-  <id>jenkins</id>
-  <name>Jenkins</name>
-  <description>This service runs Jenkins continuous integration system.</description>
-  <env name="JENKINS_HOME" value="%BASE%"/>
-  <!--
-    if you'd like to run Jenkins with a specific version of Java, specify a full path to java.exe.
-    The following value assumes that you have java in your PATH.
-  -->
-  <executable>%BASE%\jre\bin\java</executable>
-  <arguments>-Xrs -Xmx256m -Dhudson.lifecycle=hudson.lifecycle.WindowsServiceLifecycle -jar "%BASE%\jenkins.war" --httpPort=8080</arguments>
-  <!--
-    interactive flag causes the empty black Java window to be displayed.
-    I'm still debugging this.
-  <interactive />
-  -->
-  <logmode>rotate</logmode>
-
-  <onfailure action="restart" />
-</service>


Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber


Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -2,7 +2,7 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator>
+  <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>1</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
@@ -15,43 +15,18 @@
         <hudson.model.StringParameterDefinition>
           <name>BUILD_SRC64</name>
           <description>FDO Source directory</description>
-          <defaultValue>C:\fdo-3.8-x64</defaultValue>
+          <defaultValue>C:\working\sources\fdo-3.8</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>BUILD_OUTPUT64</name>
-          <description>FDO build output directory</description>
-          <defaultValue>C:\builds\fdo\3.8\x64_vc10</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>MYSQL_SDK64</name>
-          <description>MySQL Connector C SDK path</description>
-          <defaultValue>C:\fdo_rdbms_thirdparty\mysql_x64</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>ORACLE_SDK64</name>
-          <description>Oracle Instant Client SDK path</description>
-          <defaultValue>C:\fdo_rdbms_thirdparty\oracle_x64\instantclient\11.2\sdk</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
           <name>FDO_VERSION_64</name>
           <description>FDO Version Number (major.minor.rev)</description>
           <defaultValue>3.8.0</defaultValue>
         </hudson.model.StringParameterDefinition>
         <hudson.model.StringParameterDefinition>
-          <name>FDO_STAMP_FILE64</name>
-          <description>Path to store the last FDO svn revision</description>
-          <defaultValue>C:\builds\last_fdo_x64_revision.txt</defaultValue>
-        </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
           <name>REVNUM_FILE64</name>
           <description>Path to revnum.pl script</description>
           <defaultValue>C:\builds\revnum.pl</defaultValue>
         </hudson.model.StringParameterDefinition>
-        <hudson.model.StringParameterDefinition>
-          <name>FDO_BIN_EXTRAS64</name>
-          <description>Path to FDO binaries to overlay on top of the build output</description>
-          <defaultValue>C:\builds\fdo_extras_x64</defaultValue>
-        </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>


Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber



Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x
___________________________________________________________________
Added: svn:ignore
   + builds
lastStable
lastSuccessful
nextBuildNumber
scm-polling.log
svnexternals.txt


Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x/config.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 4.0.x/config.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -2,7 +2,7 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator>
+  <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>5</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
@@ -15,16 +15,18 @@
         <hudson.model.StringParameterDefinition>
           <name>VersionLabel</name>
           <description>The release version label</description>
-          <defaultValue>4.0.4</defaultValue>
+          <defaultValue>4.0.6</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.scm.SubversionSCM">
+  <scm class="hudson.scm.SubversionSCM" plugin="subversion at 1.48">
     <locations>
       <hudson.scm.SubversionSCM_-ModuleLocation>
         <remote>http://svn.osgeo.org/mapguide/branches/maestro-4.0.x</remote>
         <local>.</local>
+        <depthOption>infinity</depthOption>
+        <ignoreExternalsOption>false</ignoreExternalsOption>
       </hudson.scm.SubversionSCM_-ModuleLocation>
     </locations>
     <excludedRegions></excludedRegions>
@@ -33,6 +35,8 @@
     <excludedRevprop></excludedRevprop>
     <excludedCommitMessages></excludedCommitMessages>
     <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/>
+    <ignoreDirPropChanges>false</ignoreDirPropChanges>
+    <filterChangelog>false</filterChangelog>
   </scm>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -42,6 +46,7 @@
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
       <spec>15 * * * *</spec>
+      <ignorePostCommitHooks>false</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -51,17 +56,18 @@
 rd /S /Q out
 popd
 pushd %WORKSPACE%\Properties
-C:\builds\SetAssemblyVersion.exe -set:%VersionLabel%.%SVN_REVISION% GlobalAssemblyInfo.cs
+%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:%VersionLabel%.%SVN_REVISION% GlobalAssemblyInfo.cs
 popd
 pushd %WORKSPACE%\SDK
 rd /S /Q bin
 popd</command>
     </hudson.tasks.BatchFile>
-    <hudson.plugins.msbuild.MsBuildBuilder>
+    <hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
       <msBuildName>MSBUILD 3.5 x86</msBuildName>
       <msBuildFile>Maestro\Maestro_All.sln</msBuildFile>
       <cmdLineArgs>/p:Configuration=Release</cmdLineArgs>
       <buildVariablesAsProperties>true</buildVariablesAsProperties>
+      <continueOnBuildFailure>false</continueOnBuildFailure>
     </hudson.plugins.msbuild.MsBuildBuilder>
     <hudson.tasks.BatchFile>
       <command>pushd %WORKSPACE%\UserDoc
@@ -89,11 +95,12 @@
 7z a -tzip -mx9 C:\builds\MapGuideMaestro-%VersionLabel%-Release.zip .
 popd</command>
     </hudson.tasks.BatchFile>
-    <hudson.plugins.msbuild.MsBuildBuilder>
+    <hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
       <msBuildName>MSBUILD 4.0 x86</msBuildName>
       <msBuildFile>Doc\MaestroAPI.shfbproj</msBuildFile>
       <cmdLineArgs></cmdLineArgs>
       <buildVariablesAsProperties>true</buildVariablesAsProperties>
+      <continueOnBuildFailure>false</continueOnBuildFailure>
     </hudson.plugins.msbuild.MsBuildBuilder>
     <hudson.tasks.BatchFile>
       <command>pushd %WORKSPACE%\Doc\Help


Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk
___________________________________________________________________
Added: svn:ignore
   + builds
lastStable
lastSuccessful
nextBuildNumber
scm-polling.log
svnexternals.txt


Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml	2013-05-29 19:34:53 UTC (rev 7536)
@@ -2,7 +2,7 @@
 <project>
   <actions/>
   <description></description>
-  <logRotator>
+  <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
     <numToKeep>5</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
@@ -15,16 +15,18 @@
         <hudson.model.StringParameterDefinition>
           <name>VersionLabel</name>
           <description>The release version label</description>
-          <defaultValue>5.0b5</defaultValue>
+          <defaultValue>5.0RC2</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
   </properties>
-  <scm class="hudson.scm.SubversionSCM">
+  <scm class="hudson.scm.SubversionSCM" plugin="subversion at 1.48">
     <locations>
       <hudson.scm.SubversionSCM_-ModuleLocation>
         <remote>http://svn.osgeo.org/mapguide/trunk/Tools/Maestro</remote>
         <local>.</local>
+        <depthOption>infinity</depthOption>
+        <ignoreExternalsOption>false</ignoreExternalsOption>
       </hudson.scm.SubversionSCM_-ModuleLocation>
     </locations>
     <excludedRegions></excludedRegions>
@@ -33,6 +35,8 @@
     <excludedRevprop></excludedRevprop>
     <excludedCommitMessages></excludedCommitMessages>
     <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/>
+    <ignoreDirPropChanges>false</ignoreDirPropChanges>
+    <filterChangelog>false</filterChangelog>
   </scm>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -42,6 +46,7 @@
   <triggers class="vector">
     <hudson.triggers.SCMTrigger>
       <spec>15 * * * *</spec>
+      <ignorePostCommitHooks>false</ignorePostCommitHooks>
     </hudson.triggers.SCMTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -51,17 +56,18 @@
 rd /S /Q out
 popd
 pushd %WORKSPACE%\Properties
-C:\builds\SetAssemblyVersion.exe -set:5.0.0.%SVN_REVISION% GlobalAssemblyInfo.cs
+%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:5.0.0.%SVN_REVISION% GlobalAssemblyInfo.cs
 popd
 pushd %WORKSPACE%\SDK
 rd /S /Q bin
 popd</command>
     </hudson.tasks.BatchFile>
-    <hudson.plugins.msbuild.MsBuildBuilder>
+    <hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
       <msBuildName>MSBUILD 4.0 x86</msBuildName>
       <msBuildFile>Maestro\Maestro_All.sln</msBuildFile>
       <cmdLineArgs>/p:Configuration=Release</cmdLineArgs>
       <buildVariablesAsProperties>true</buildVariablesAsProperties>
+      <continueOnBuildFailure>false</continueOnBuildFailure>
     </hudson.plugins.msbuild.MsBuildBuilder>
     <hudson.tasks.BatchFile>
       <command>pushd %WORKSPACE%\out\Release\AddIns
@@ -95,11 +101,12 @@
 7z a -tzip -mx9 C:\builds\MapGuideMaestro-%VersionLabel%-Release.zip .
 popd</command>
     </hudson.tasks.BatchFile>
-    <hudson.plugins.msbuild.MsBuildBuilder>
+    <hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
       <msBuildName>MSBUILD 4.0 x86</msBuildName>
       <msBuildFile>Doc\MaestroAPI.shfbproj</msBuildFile>
       <cmdLineArgs></cmdLineArgs>
       <buildVariablesAsProperties>true</buildVariablesAsProperties>
+      <continueOnBuildFailure>false</continueOnBuildFailure>
     </hudson.plugins.msbuild.MsBuildBuilder>
     <hudson.tasks.BatchFile>
       <command>pushd %WORKSPACE%\Doc\Help


Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber



Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber



Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/MgInstantSetup
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber



Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/mg-desktop-net40-vc10-x64
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber



Property changes on: trunk/Tools/JenkinsCI/home/slave_win/jobs/mg-desktop-net40-vc10-x86
___________________________________________________________________
Added: svn:ignore
   + builds
nextBuildNumber


Modified: trunk/Tools/JenkinsCI/readme.txt
===================================================================
--- trunk/Tools/JenkinsCI/readme.txt	2013-05-29 17:46:13 UTC (rev 7535)
+++ trunk/Tools/JenkinsCI/readme.txt	2013-05-29 19:34:53 UTC (rev 7536)
@@ -66,24 +66,40 @@
 
 * Currently configured for MGOS 2.5 and FDO 3.8, adjust these version numbers as necessary
 
-C:\apache-ant-1.8.3		[extracted location of apache ant v1.8.3]
-C:\builds		[all build artifacts produced by Jenkins will be here]
-    - revnum.pl [copy from http://svn.osgeo.org/fdo/branches/2.5/Installer/scripts/revnum.pl]
-C:\fdo_rdbms_thirdparty
-    mysql		[extract/copy MySQL Connector C 32-bit headers/libs here]
-    mysql_x64	[extract/copy MySQL Connector C 64-bit headers/libs here]
-    oracle		[extract 32-bit oracle 11.2 instant client sdk here]
-    oracle_x64	[extract 64-bit oracle 11.2 instant client sdk here]
-C:\fdo-3.8-x86 	[svn wc of http://svn.osgeo.org/fdo/branches/3.8]
-C:\fdo-3.8-x64 	[svn wc of http://svn.osgeo.org/fdo/branches/3.8]
-C:\mg-2.5-x86
-    - Installer [svn wc of http://svn.osgeo.org/mapguide/branches/2.5/Installer]
-    - MgDev		[svn wc of http://svn.osgeo.org/mapguide/branches/2.5/MgDev]
-C:\mg-2.5-x64
-    - Installer [svn wc of http://svn.osgeo.org/mapguide/branches/2.5/Installer]
-    - MgDev		[svn wc of http://svn.osgeo.org/mapguide/branches/2.5/MgDev]
-C:\nasm			[extract nasm binaries here]
+C:\apache-ant-1.8.3     [extracted location of apache ant v1.8.3]
+C:\builds               [all build artifacts produced by Jenkins will be here]
+C:\nasm	                [extract nasm binaries here]
+C:\working
+    libs
+        fdo_rdbms_thirdparty
+            mysql       [extract/copy MySQL Connector C 32-bit headers/libs here]
+            mysql_x64   [extract/copy MySQL Connector C 64-bit headers/libs here]
+            oracle      [extract 32-bit oracle 11.2 instant client sdk here]
+            oracle_x64  [extract 64-bit oracle 11.2 instant client sdk here]
+    sources
+        fdo-3.8         [svn checkout of http://svn.osgeo.org/fdo/branches/3.8]
+        mg-2.5
+            Installer   [svn checkout of http://svn.osgeo.org/mapguide/branches/2.5/Installer]
+            MgDev       [svn checkout of http://svn.osgeo.org/mapguide/branches/2.5/MgDev]
+    JenkinsCI           [svn checkout of http://svn.osgeo.org/mapguide/trunk/Tools/JenkinsCI]
+        home
+            slave_win   [the path of JENKINS_HOME]
 
+Required Jenkins Plugins
+========================
+ 
+ * MSBuild
+
+Jenkins Post-install config
+===========================
+
+ * Environment variables (already defined in JenkinsCI checkout. Double check paths)
+    * MG_BUILD_ARTIFACT_PATH = C:\builds
+    * MG_TOOL_PATH = C:\working\JenkinsCI\tools
+    * MG_LIB_ROOT = C:\working\libs
+    * MG_BUILD_AREA = C:\working\build_area
+    * WINDOWS_SDK_71_ROOT = C:\Program Files\Microsoft SDKs\Windows\v7.1
+
 PATH environment variable
 =========================
 


Property changes on: trunk/Tools/JenkinsCI/tools
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/tools/SetAssemblyVersion.exe
===================================================================
(Binary files differ)


Property changes on: trunk/Tools/JenkinsCI/tools/SetAssemblyVersion.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Tools/JenkinsCI/tools/UpdateVersion.exe
===================================================================
(Binary files differ)


Property changes on: trunk/Tools/JenkinsCI/tools/UpdateVersion.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/Tools/JenkinsCI/tools/fdo_enable_vcexpress64.bat
===================================================================
--- trunk/Tools/JenkinsCI/tools/fdo_enable_vcexpress64.bat	                        (rev 0)
+++ trunk/Tools/JenkinsCI/tools/fdo_enable_vcexpress64.bat	2013-05-29 19:34:53 UTC (rev 7536)
@@ -0,0 +1,73 @@
+ at echo off
+REM Description: Helper script to enable building 64-bit FDO with the 64-bit C++ compiler from the Windows 7.1 SDK
+REM Author: Jackie Ng (jumpinjackie at gmail.com)
+REM Usage: fdo_enable_vcexpress64.bat 
+SET FDOROOT=%1
+if not exist "%FDOROOT%" goto usage
+if exist %FDOROOT%\Fdo\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Fdo\build.bat
+    echo Updated %FDOROOT%\Fdo\build.bat
+)
+if exist %FDOROOT%\Providers\ArcSDE\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\ArcSDE\build.bat
+    echo Updated %FDOROOT%\Providers\ArcSDE\build.bat
+)
+if exist %FDOROOT%\Providers\GDAL\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\GDAL\build.bat
+    echo Updated %FDOROOT%\Providers\GDAL\build.bat
+)
+if exist %FDOROOT%\Providers\GenericRdbms\Src\MySQL\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\GenericRdbms\Src\MySQL\build.bat
+    echo Updated %FDOROOT%\Providers\GenericRdbms\Src\MySQL\build.bat
+)
+if exist %FDOROOT%\Providers\GenericRdbms\Src\ODBC\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\GenericRdbms\Src\ODBC\build.bat
+    echo Updated %FDOROOT%\Providers\GenericRdbms\Src\ODBC\build.bat
+)
+if exist %FDOROOT%\Providers\GenericRdbms\Src\PostGis\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\GenericRdbms\Src\PostGis\build.bat
+    echo Updated %FDOROOT%\Providers\GenericRdbms\Src\PostGis\build.bat
+)
+if exist %FDOROOT%\Providers\GenericRdbms\Src\SQLServerSpatial\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\GenericRdbms\Src\SQLServerSpatial\build.bat
+    echo Updated %FDOROOT%\Providers\GenericRdbms\Src\SQLServerSpatial\build.bat
+)
+if exist %FDOROOT%\Providers\KingOracle\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\KingOracle\build.bat
+    echo Updated %FDOROOT%\Providers\KingOracle\build.bat
+)
+if exist %FDOROOT%\Providers\OGR\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\OGR\build.bat
+    echo Updated %FDOROOT%\Providers\OGR\build.bat
+)
+if exist %FDOROOT%\Providers\SDF\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\SDF\build.bat
+    echo Updated %FDOROOT%\Providers\SDF\build.bat
+)
+if exist %FDOROOT%\Providers\SHP\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\SHP\build.bat
+    echo Updated %FDOROOT%\Providers\SHP\build.bat
+)
+if exist %FDOROOT%\Providers\SQLite\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\SQLite\build.bat
+    echo Updated %FDOROOT%\Providers\SQLite\build.bat
+)
+if exist %FDOROOT%\Providers\WFS\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\WFS\build.bat
+    echo Updated %FDOROOT%\Providers\WFS\build.bat
+)
+if exist %FDOROOT%\Providers\WMS\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Providers\WMS\build.bat
+    echo Updated %FDOROOT%\Providers\WMS\build.bat
+)
+if exist %FDOROOT%\Thirdparty\build.bat (
+    sed -i "s/REM SET EXTRA_MSBUILD_PROPERTIES/SET EXTRA_MSBUILD_PROPERTIES/g" %FDOROOT%\Thirdparty\build.bat
+    echo Updated %FDOROOT%\Thirdparty\build.bat
+)
+goto exit
+:usage
+echo Usage - fdo_enable_vcexpress64.bat FDO_SRC_ROOT
+:error
+exit /B 1
+:exit
+exit /B 0
\ No newline at end of file

Added: trunk/Tools/JenkinsCI/tools/revnum.pl
===================================================================
--- trunk/Tools/JenkinsCI/tools/revnum.pl	                        (rev 0)
+++ trunk/Tools/JenkinsCI/tools/revnum.pl	2013-05-29 19:34:53 UTC (rev 7536)
@@ -0,0 +1,8 @@
+while (defined($line = <STDIN>))
+{
+   ($key,$value) = split(/: /,$line);
+   if ($key eq "Last Changed Rev")
+   {
+      print $value;
+   }
+}
\ No newline at end of file

More information about the mapguide-commits mailing list