[mapguide-commits] r7769 - in trunk/Tools/JenkinsCI/home/slave_win: . jobs jobs/FDO 3.7 x64 jobs/FDO 3.7 x86 jobs/Maestro 5.0.x jobs/Maestro trunk jobs/MapGuide Open Source 2.4 x64 jobs/MapGuide Open Source 2.4 x86 jobs/MapGuide Open Source x64 jobs/MapGuide Open Source x86

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Aug 16 04:11:59 PDT 2013


Author: jng
Date: 2013-08-16 04:11:59 -0700 (Fri, 16 Aug 2013)
New Revision: 7769

Added:
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x64/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x64/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x86/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x86/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x64/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x64/config.xml
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x86/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x86/config.xml
Modified:
   trunk/Tools/JenkinsCI/home/slave_win/
   trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/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:
These are the Jenkins CI configs used to produce MGOS 2.4.1 and MGOS 2.5.1


Property changes on: trunk/Tools/JenkinsCI/home/slave_win
___________________________________________________________________
Modified: svn:ignore
   - .owner
Fingerprint cleanup.log
Workspace clean-up.log
hudson.maven.MavenModuleSet.xml
hudson.scm.CVSSCM.xml
hudson.scm.SubversionSCM.xml
hudson.tasks.Ant.xml
hudson.tasks.Mailer.xml
hudson.tasks.Maven.xml
hudson.tasks.Shell.xml
hudson.triggers.SCMTrigger.xml
identity.key
jenkins.model.JenkinsLocationConfiguration.xml
jenkins.mvn.GlobalMavenConfig.xml
nodeMonitors.xml
plugins
secret.key
secret.key.not-so-secret
secrets
updates
war

   + .owner
Fingerprint cleanup.log
Workspace clean-up.log
hudson.maven.MavenModuleSet.xml
hudson.scm.CVSSCM.xml
hudson.scm.SubversionSCM.xml
hudson.tasks.Ant.xml
hudson.tasks.Mailer.xml
hudson.tasks.Maven.xml
hudson.tasks.Shell.xml
hudson.triggers.SCMTrigger.xml
identity.key
jenkins.model.JenkinsLocationConfiguration.xml
jenkins.mvn.GlobalMavenConfig.xml
nodeMonitors.xml
plugins
secret.key
secret.key.not-so-secret
secrets
updates
war
Connection Activity monitoring to slaves.log



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

Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x64/config.xml	                        (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x64/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_BUILD_SRC64</name>
+          <description>FDO Source directory</description>
+          <defaultValue>C:\working\sources\fdo-3.7</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_VERSION64</name>
+          <description>FDO Version Number (major.minor.rev)</description>
+          <defaultValue>3.7.0</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CLEAR_WORKING_AREA</name>
+          <description></description>
+          <defaultValue>true</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>(Default)</jdk>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.BatchFile>
+      <command>@echo off
+SET FDOMYSQL=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\mysql_x64
+SET FDOORACLE=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\oracle_x64\instantclient\11.2\sdk
+SET FDO_BUILD_OUTPUT64=%MG_BUILD_ARTIFACT_PATH%\fdo\%FDO_VERSION64%\x64_vc10
+SET FDO_BIN_EXTRAS64=%MG_LIB_ROOT%\fdo_extras\%FDO_VERSION64%\x64
+SET REVNUM_FILE64=%MG_TOOL_PATH%\revnum.pl
+SET FDO_STAMP_FILE64=%MG_BUILD_ARTIFACT_PATH%\last_fdo_%FDO_VERSION64%_revision_x64.txt
+SET FDO_WORKING_AREA64=%MG_BUILD_AREA%\FDO\%FDO_VERSION64%\x64
+
+echo ============ Env Vars for FDO Build =====================
+echo FDOMYSQL           = %FDOMYSQL%
+echo FDOORACLE          = %FDOORACLE%
+echo FDO_BUILD_OUTPUT64 = %FDO_BUILD_OUTPUT64%
+echo FDO_BIN_EXTRAS64   = %FDO_BIN_EXTRAS64%
+echo REVNUM_FILE64      = %REVNUM_FILE64%
+echo FDO_STAMP_FILE64   = %FDO_STAMP_FILE64%
+echo FDO_WORKING_AREA64 = %FDO_WORKING_AREA64%
+echo =========================================================
+
+REM Pre-build checks, nuke artifact dir and working area
+echo [prepare]: Clean out build area and build artifacts
+if exist %FDO_BUILD_OUTPUT64% rd /S /Q %FDO_BUILD_OUTPUT64%
+if "%CLEAR_WORKING_AREA%"=="false" (
+    echo [prepare]: Skip cleaning build area
+    goto build_fdo
+)
+if exist %FDO_WORKING_AREA64% rd /S /Q %FDO_WORKING_AREA64%
+if not exist %FDO_WORKING_AREA64% mkdir %FDO_WORKING_AREA64%
+
+REM Need to supply --force otherwise it won't export into the dir we made
+echo [prepare]: Exporting SVN working copy to build area
+SET BUILD_ACTION=Exporting SVN working copy to build area
+svn export %FDO_BUILD_SRC64% %FDO_WORKING_AREA64% --force
+if "%errorlevel%"=="1" goto error
+
+REM Copy non-UAC UpdateVersion
+echo [prepare]: Copy non UAC-gimped UpdateVersion
+SET BUILD_ACTION=Copy non UAC-gimped UpdateVersion
+copy /Y %MG_TOOL_PATH%\UpdateVersion.exe %FDO_WORKING_AREA64%\Thirdparty\util\UpdateVersion\bin
+if "%errorlevel%"=="1" goto error
+
+REM Prepare for Windows SDK 7.1 C++ compiler
+echo [prepare]: Enabling build settings for compilation with Windows 7.1 SDK C++ compiler
+SET BUILD_ACTION=Enabling build settings for compilation with Windows 7.1 SDK C++ compiler
+call %MG_TOOL_PATH%\fdo_enable_vcexpress64.bat %FDO_WORKING_AREA64%
+if "%errorlevel%"=="1" goto error
+
+:build_fdo
+echo [prepare]: Noting SVN revision
+pushd %FDO_BUILD_SRC64% 
+REM If we ever do implement CI build triggers, remove this update command
+svn info . | perl %REVNUM_FILE64% > revision.txt
+set /p REVISION= < revision.txt
+copy /Y revision.txt %FDO_STAMP_FILE64%
+popd
+
+pushd %FDO_WORKING_AREA64%
+echo [build]: Set env vars
+call "%WINDOWS_SDK_71_ROOT%\Bin\SetEnv.cmd" /release /x64
+call setenvironment.bat x64 VC10
+
+echo [build]: build thirdparty
+SET BUILD_ACTION=Build FDO Thirdparty
+call build_thirdparty.bat -p=x64 -a=buildinstall -o=%FDO_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+echo [build]: build core and providers
+SET BUILD_ACTION=Build FDO core/providers
+call build.bat -p=x64 -a=buildinstall -o=%FDO_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+if not exist %FDO_BIN_EXTRAS64% goto pack
+echo [build]: Overlaying FDO extras to build artifacts
+pushd %FDO_BIN_EXTRAS64%
+copy /Y *.* %FDO_BUILD_OUTPUT64%\Fdo\Bin
+popd
+:pack
+echo [build]: Pack files
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=fdo -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=shp -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=sdf -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=wfs -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=wms -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=rdbms -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=mysql -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=odbc -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=sqlspatial -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=gdal -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=kingoracle -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=ogr -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT64%\Fdo -o=%FDO_BUILD_OUTPUT64%\dist -w=sqlite -b=%REVISION% -r=%FDO_VERSION_64%
+popd
+goto end
+:error
+echo An error occurred while building FDO: %BUILD_ACTION%
+exit /b 1
+:end
+exit /b 0</command>
+    </hudson.tasks.BatchFile>
+  </builders>
+  <publishers>
+    <hudson.tasks.BuildTrigger>
+      <childProjects>MapGuide Open Source 2.4 x64</childProjects>
+      <threshold>
+        <name>SUCCESS</name>
+        <ordinal>0</ordinal>
+        <color>BLUE</color>
+      </threshold>
+    </hudson.tasks.BuildTrigger>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file


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

Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x86/config.xml	                        (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.7 x86/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -0,0 +1,154 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_BUILD_SRC</name>
+          <description>FDO Source directory</description>
+          <defaultValue>C:\working\sources\fdo-3.7</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_VERSION</name>
+          <description>FDO Version Number (major.minor.rev)</description>
+          <defaultValue>3.7.0</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CLEAR_WORKING_AREA</name>
+          <description></description>
+          <defaultValue>true</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>(Default)</jdk>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.BatchFile>
+      <command>@echo off
+SET FDOMYSQL=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\mysql
+SET FDOORACLE=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\oracle\instantclient\11.2\sdk
+SET FDO_BUILD_OUTPUT=%MG_BUILD_ARTIFACT_PATH%\fdo\%FDO_VERSION%\x86_vc10
+SET FDO_BIN_EXTRAS=%MG_LIB_ROOT%\fdo_extras\%FDO_VERSION%\x86
+SET REVNUM_FILE=%MG_TOOL_PATH%\revnum.pl
+SET FDO_STAMP_FILE=%MG_BUILD_ARTIFACT_PATH%\last_fdo_%FDO_VERSION%_revision_x86.txt
+SET FDO_WORKING_AREA=%MG_BUILD_AREA%\FDO\%FDO_VERSION%\x86
+
+echo ============ Env Vars for FDO Build =====================
+echo FDOMYSQL           = %FDOMYSQL%
+echo FDOORACLE          = %FDOORACLE%
+echo FDO_BUILD_OUTPUT   = %FDO_BUILD_OUTPUT%
+echo FDO_BIN_EXTRAS     = %FDO_BIN_EXTRAS%
+echo REVNUM_FILE        = %REVNUM_FILE%
+echo FDO_STAMP_FILE     = %FDO_STAMP_FILE%
+echo FDO_WORKING_AREA   = %FDO_WORKING_AREA%
+echo =========================================================
+
+REM Pre-build checks, nuke artifact dir and working area
+echo [prepare]: Clean out build area and build artifacts
+if exist %FDO_BUILD_OUTPUT% rd /S /Q %FDO_BUILD_OUTPUT%
+if "%CLEAR_WORKING_AREA%"=="false" (
+    echo [prepare]: Skip cleaning build area
+    goto build_fdo
+)
+if exist %FDO_WORKING_AREA% rd /S /Q %FDO_WORKING_AREA%
+if not exist %FDO_WORKING_AREA% mkdir %FDO_WORKING_AREA%
+
+REM Need to supply --force otherwise it won't export into the dir we made
+echo [prepare]: Exporting SVN working copy to build area
+SET BUILD_ACTION=Exporting SVN working copy to build area
+svn export %FDO_BUILD_SRC% %FDO_WORKING_AREA% --force
+if "%errorlevel%"=="1" goto error
+
+REM Copy non-UAC UpdateVersion
+echo [prepare]: Copy non UAC-gimped UpdateVersion
+SET BUILD_ACTION=Copy non UAC-gimped UpdateVersion
+copy /Y %MG_TOOL_PATH%\UpdateVersion.exe %FDO_WORKING_AREA%\Thirdparty\util\UpdateVersion\bin
+if "%errorlevel%"=="1" goto error
+
+REM Prepare for Windows SDK 7.1 C++ compiler
+REM echo [prepare]: Enabling build settings for compilation with Windows 7.1 SDK C++ compiler
+REM SET BUILD_ACTION=Enabling build settings for compilation with Windows 7.1 SDK C++ compiler
+REM call %MG_TOOL_PATH%\fdo_enable_vcexpress64.bat %FDO_WORKING_AREA%
+REM if "%errorlevel%"=="1" goto error
+
+:build_fdo
+echo [prepare]: Noting SVN revision
+pushd %FDO_BUILD_SRC% 
+REM If we ever do implement CI build triggers, remove this update command
+svn info . | perl %REVNUM_FILE% > revision.txt
+set /p REVISION= < revision.txt
+copy /Y revision.txt %FDO_STAMP_FILE%
+popd
+
+pushd %FDO_WORKING_AREA%
+echo [build]: Set env vars
+REM call "%WINDOWS_SDK_71_ROOT%\Bin\SetEnv.cmd" /release /x86
+call setenvironment.bat x86 VC10
+
+echo [build]: build thirdparty
+SET BUILD_ACTION=Build FDO Thirdparty
+call build_thirdparty.bat -p=Win32 -a=buildinstall -o=%FDO_BUILD_OUTPUT%
+if "%errorlevel%"=="1" goto error
+
+echo [build]: build core and providers
+SET BUILD_ACTION=Build FDO core/providers
+call build.bat -p=Win32 -a=buildinstall -o=%FDO_BUILD_OUTPUT%
+if "%errorlevel%"=="1" goto error
+
+if not exist %FDO_BIN_EXTRAS% goto pack
+echo [build]: Overlaying FDO extras to build artifacts
+pushd %FDO_BIN_EXTRAS%
+copy /Y *.* %FDO_BUILD_OUTPUT%\Fdo\Bin
+popd
+:pack
+echo [build]: Pack files
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=fdo -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=shp -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=sdf -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=wfs -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=wms -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=rdbms -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=mysql -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=odbc -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=sqlspatial -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=gdal -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=kingoracle -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=ogr -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%FDO_BUILD_OUTPUT%\Fdo -o=%FDO_BUILD_OUTPUT%\dist -w=sqlite -b=%REVISION% -r=%FDO_VERSION%
+popd
+goto end
+:error
+echo An error occurred while building FDO: %BUILD_ACTION%
+exit /b 1
+:end
+exit /b 0</command>
+    </hudson.tasks.BatchFile>
+  </builders>
+  <publishers>
+    <hudson.tasks.BuildTrigger>
+      <childProjects>MapGuide Open Source 2.4 x86</childProjects>
+      <threshold>
+        <name>SUCCESS</name>
+        <ordinal>0</ordinal>
+        <color>BLUE</color>
+      </threshold>
+    </hudson.tasks.BuildTrigger>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file


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

Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml	                        (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>5</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>VersionLabel</name>
+          <description>The release version label</description>
+          <defaultValue>5.0.1</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.SubversionSCM" plugin="subversion at 1.48">
+    <locations>
+      <hudson.scm.SubversionSCM_-ModuleLocation>
+        <remote>http://svn.osgeo.org/mapguide/branches/maestro-5.0.x</remote>
+        <local>.</local>
+        <depthOption>infinity</depthOption>
+        <ignoreExternalsOption>false</ignoreExternalsOption>
+      </hudson.scm.SubversionSCM_-ModuleLocation>
+    </locations>
+    <excludedRegions></excludedRegions>
+    <includedRegions></includedRegions>
+    <excludedUsers></excludedUsers>
+    <excludedRevprop></excludedRevprop>
+    <excludedCommitMessages></excludedCommitMessages>
+    <workspaceUpdater class="hudson.scm.subversion.UpdateUpdater"/>
+    <ignoreDirPropChanges>false</ignoreDirPropChanges>
+    <filterChangelog>false</filterChangelog>
+  </scm>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>(Default)</jdk>
+  <triggers class="vector">
+    <hudson.triggers.SCMTrigger>
+      <spec>15 * * * *</spec>
+      <ignorePostCommitHooks>false</ignorePostCommitHooks>
+    </hudson.triggers.SCMTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.BatchFile>
+      <command>pushd %WORKSPACE%
+rd /S /Q out
+popd
+pushd %WORKSPACE%\Properties
+%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 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
+rd /S /Q GeoRest
+popd</command>
+    </hudson.tasks.BatchFile>
+    <hudson.tasks.BatchFile>
+      <command>pushd %WORKSPACE%\UserDoc
+call make.bat html
+popd
+pushd %WORKSPACE%\UserDoc\build\html
+xcopy /S /Y *.* "%WORKSPACE%\out\Release\UserDoc\"
+popd
+</command>
+    </hudson.tasks.BatchFile>
+    <hudson.tasks.BatchFile>
+      <command>pushd %WORKSPACE%\Thirdparty\NSIS
+makensis.exe /DSLN_CONFIG=Release /DCPU=x86 /DRELEASE_VERSION=%VersionLabel% "%WORKSPACE%\Install\Maestro.nsi"
+pushd 
+pushd %WORKSPACE%\out
+if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
+move /Y *.exe %MG_BUILD_ARTIFACT_PATH%\maestro
+popd</command>
+    </hudson.tasks.BatchFile>
+    <hudson.tasks.BatchFile>
+      <command>pushd %WORKSPACE%\out\Release\AddIns
+rd /S /Q Local
+rd /S /Q Scripting
+popd
+pushd %WORKSPACE%\out\Release
+del /Q LocalConfigure.*
+if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
+7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MapGuideMaestro-%VersionLabel%-Release.zip .
+popd</command>
+    </hudson.tasks.BatchFile>
+    <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
+move /Y MaestroAPI.chm "%WORKSPACE%\SDK"
+popd
+pushd %WORKSPACE%\SDK
+if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
+7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MaestroSDK_%VersionLabel%.zip .
+popd</command>
+    </hudson.tasks.BatchFile>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file

Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml	2013-08-15 09:57:54 UTC (rev 7768)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -15,7 +15,7 @@
         <hudson.model.StringParameterDefinition>
           <name>VersionLabel</name>
           <description>The release version label</description>
-          <defaultValue>5.0RC2</defaultValue>
+          <defaultValue>5.1</defaultValue>
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>


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

Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x64/config.xml	                        (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x64/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -0,0 +1,327 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>RELEASE_LABEL64</name>
+          <description></description>
+          <defaultValue>Final</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>WITH_ARCSDE</name>
+          <description></description>
+          <defaultValue>yes</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_MAJOR</name>
+          <description></description>
+          <defaultValue>2</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_MINOR</name>
+          <description></description>
+          <defaultValue>4</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_BUILD</name>
+          <description></description>
+          <defaultValue>1</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_BUILD_SRC64</name>
+          <description></description>
+          <defaultValue>C:\working\sources\mg-2.4</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_SRC64</name>
+          <description></description>
+          <defaultValue>C:\builds\fdo\3.7.0\x64_vc10\Fdo</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>INSTANT_SETUP_SRC</name>
+          <description></description>
+          <defaultValue>C:\working\sources\MgInstantSetup</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CLEAR_WORKING_AREA</name>
+          <description></description>
+          <defaultValue>true</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>JDK6 64-bit</jdk>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.BatchFile>
+      <command>@echo off
+
+SET VCBEXTENSION=_vs10
+SET VC_COMPILER=vc100
+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 MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
+SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
+SET MG_BUILD_OUTPUT_ROOT64=%MG_BUILD_ARTIFACT_PATH%\mapguide
+SET MG_BUILD_OUTPUT64=%MG_BUILD_OUTPUT_ROOT64%\%MG_VER_MAJOR_MINOR_BUILD%\x64\release
+SET MG_BUILD_AREA64=%MG_BUILD_AREA%\mapguide\%MG_VER_MAJOR_MINOR_BUILD%\x64
+SET REVNUM_FILE64=%MG_TOOL_PATH%\revnum.pl
+SET MG_STAMP_FILE64=%MG_BUILD_ARTIFACT_PATH%\last_mapguide_%MG_VER_MAJOR_MINOR_BUILD%_revision_x64.txt
+SET BUILD_ACTION=
+
+echo =================== Env Vars for MapGuide =============================
+echo MG_VER_MAJOR_MINOR         = %MG_VER_MAJOR_MINOR%
+echo MG_VER_MAJOR_MINOR_BUILD   = %MG_VER_MAJOR_MINOR_BUILD%
+echo MG_BUILD_OUTPUT_ROOT64     = %MG_BUILD_OUTPUT_ROOT64%
+echo MG_BUILD_OUTPUT64          = %MG_BUILD_OUTPUT64%
+echo MG_BUILD_AREA64            = %MG_BUILD_AREA64%
+echo REVNUM_FILE64              = %REVNUM_FILE64%
+echo MG_STAMP_FILE64            = %MG_STAMP_FILE64%
+echo INSTANT_SETUP_SRC          = %INSTANT_SETUP_SRC%
+echo JAVA_HOME                  = %JAVA_HOME%
+echo ANT_HOME                   = %ANT_HOME%
+echo =======================================================================
+
+echo [prepare]: Cleaning out build artifacts
+if exist %MG_BUILD_OUTPUT64% rd /S /Q %MG_BUILD_OUTPUT64%
+
+pushd %MG_BUILD_SRC64%\MgDev
+echo [prepare]: Noting SVN revision
+svn info . | perl %REVNUM_FILE64% > revision.txt
+set /p MG_REVISION64= < revision.txt
+copy /Y revision.txt %MG_STAMP_FILE64%
+popd
+
+if "%CLEAR_WORKING_AREA%"=="false" (
+    echo [prepare]: Skip cleaning build area
+    goto build_mapguide
+)
+
+echo [prepare]: Cleaning out SVN metadata in build area
+if exist %MG_BUILD_AREA64% for /R %MG_BUILD_AREA64% %%X in (.svn) do (RD /S /Q %%X 2>nul)
+echo [prepare]: Cleaning out build area
+if exist %MG_BUILD_AREA64% rd /S /Q %MG_BUILD_AREA64%
+echo [prepare]: Re-creating output directories
+if not exist %MG_BUILD_AREA64%\Installer mkdir %MG_BUILD_AREA64%\Installer
+if not exist %MG_BUILD_AREA64%\MgDev mkdir %MG_BUILD_AREA64%\MgDev
+if not exist %MG_BUILD_ARTIFACT_PATH%\mg-desktop mkdir %MG_BUILD_ARTIFACT_PATH%\mg-desktop
+
+echo [prepare]: Exporting SVN working copy to build area (Installer)
+SET BUILD_ACTION=Exporting SVN working copy to build area (Installer)
+svn export %MG_BUILD_SRC64%\Installer %MG_BUILD_AREA64%\Installer --force
+if "%errorlevel%"=="1" goto error
+
+echo [prepare]: Copying SVN working copy to build area (MgDev)
+SET BUILD_ACTION=Copying SVN working copy to build area (MgDev)
+svn export %MG_BUILD_SRC64%\MgDev %MG_BUILD_AREA64%\MgDev --force
+if "%errorlevel%"=="1" goto error
+
+echo [prepare]: Overlaying SVN metadata
+REM Yeah, we're basically re-copying, but this will include missing SVN metadata that export obviously leaves out
+robocopy %MG_BUILD_SRC64%\MgDev\Oem\fusion_build %MG_BUILD_AREA64%\MgDev\Oem\fusion_build /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\localized %MG_BUILD_AREA64%\MgDev\Web\src\localized /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\mapadmin %MG_BUILD_AREA64%\MgDev\Web\src\mapadmin /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\UnitTest/WebTier\MapAgent\MapAgentForms %MG_BUILD_AREA64%\MgDev\UnitTest/WebTier\MapAgent\MapAgentForms /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\mapviewerjava %MG_BUILD_AREA64%\MgDev\Web\src\mapviewerjava /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\mapviewernet %MG_BUILD_AREA64%\MgDev\Web\src\mapviewernet /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\mapviewerphp %MG_BUILD_AREA64%\MgDev\Web\src\mapviewerphp /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\schemareport %MG_BUILD_AREA64%\MgDev\Web\src\schemareport /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\stdicons %MG_BUILD_AREA64%\MgDev\Web\src\stdicons /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Web\src\viewerfiles %MG_BUILD_AREA64%\MgDev\Web\src\viewerfiles /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\dotnetsamples %MG_BUILD_AREA64%\MgDev\Doc\samples\dotnetsamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\dotnetviewersample %MG_BUILD_AREA64%\MgDev\Doc\samples\dotnetviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\javasamples %MG_BUILD_AREA64%\MgDev\Doc\samples\javasamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\javaviewersample %MG_BUILD_AREA64%\MgDev\Doc\samples\javaviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\phpsamples %MG_BUILD_AREA64%\MgDev\Doc\samples\phpsamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\samples\phpviewersample %MG_BUILD_AREA64%\MgDev\Doc\samples\phpviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC64%\MgDev\Doc\viewerapi %MG_BUILD_AREA64%\MgDev\Doc\viewerapi /E /NFL /NDL /nc /ns /np /MT
+
+echo [prepare]: Setup FDO in Oem
+cd %MG_BUILD_AREA64%\MgDev\Oem\FDO
+xcopy /S /Y /I %FDO_SRC64%\Inc Inc
+xcopy /S /Y /I %FDO_SRC64%\Lib Lib64
+xcopy /S /Y /I %FDO_SRC64%\Bin Bin\Release64
+xcopy /S /Y /I %FDO_SRC64%\Bin\com\*.* Bin\Release64\com
+REM For release we don't want pdbs and .net assemblies
+cd %MG_BUILD_AREA64%\MgDev\Oem\FDO\Bin\Release64
+del /Q OSGeo.FDO.*
+del /Q *.pdb
+
+echo [prepare]: Pre-process for 64-bit compilation with Windows SDK 7.1
+sed -i "s/\%%MSBUILD\%% InstallerPreReq\%%VS_SLN_SUFFIX\%%.sln/REM \%%MSBUILD\%% InstallerPreReq\%%VS_SLN_SUFFIX\%%.sln/g" %MG_BUILD_AREA64%\Installer\build64.bat
+sed -i "s/REM call build64_vce.bat/call build64_vce.bat/g" %MG_BUILD_AREA64%\Installer\build64.bat
+echo Updated - %MG_BUILD_AREA64%\Installer\build64.bat
+
+:build_mapguide
+cd %MG_BUILD_AREA64%\MgDev
+echo [build]: Stamp version numbers
+SET BUILD_ACTION=Stamp version numbers
+cscript updateversion.vbs /major:%MG_VER_MAJOR% /minor:%MG_VER_MINOR% /point:%MG_VER_BUILD% /build:%MG_REVISION64%
+call stampassemblies.bat %MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%
+if "%errorlevel%"=="1" goto error
+
+REM ========================================= MapGuide ====================================================
+
+cd %MG_BUILD_AREA64%\MgDev
+echo [build]: Set env vars
+call setenvironment64.bat vc10
+
+echo [build]: Prep httpd source
+cd %MG_BUILD_AREA64%\MgDev\Oem\LinuxApt
+if not exist httpd-2.2.21.tar 7z x httpd-2.2.21.tar.gz
+REM Extract regardless. We may have an incomplete directory here because windows is stingy
+REM about hidden/locked files when deleting a directory you're sure is clean
+7z x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
+
+echo [build]: build oem/server/web
+cd %MG_BUILD_AREA64%\MgDev
+SET BUILD_ACTION=build oem/server/web
+call build64.bat -o=%MG_BUILD_OUTPUT64% -v
+if "%errorlevel%"=="1" goto error
+
+echo [build]: install files to build artifact directory
+SET BUILD_ACTION=install files to build artifact directory
+call build64.bat -a=install -o=%MG_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+REM Move fusion-selfbuild tools out of staging area
+pushd %MG_BUILD_OUTPUT64%\fusion-selfbuild
+move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT64%
+popd
+pushd %MG_BUILD_OUTPUT64%
+rd /S /Q fusion-selfbuild
+popd
+
+REM ========================================= mg-desktop ====================================================
+:build_mgdesktop
+REM HACK: mg-desktop batch files not aware of new output dir so set old one
+SET MG_OUTPUT=%MG_BUILD_AREA64%\MgDev\Release64
+pushd %MG_BUILD_AREA64%\MgDev
+echo [build]: mg-desktop
+SET BUILD_ACTION=Build mg-desktop
+call build_desktop.bat x64
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA64%\MgDev\nuget
+echo [clean]: Nuget package temp files
+call package_clean.bat
+popd
+
+pushd %MG_BUILD_AREA64%\MgDev
+echo [build]: Nuget packages
+call nuget_prepare.bat %MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64% x64
+SET BUILD_ACTION=Nuget packages
+call nuget_pack.bat x64
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA64%\MgDev\nuget
+echo [build]: Copy mg-desktop build artifacts (NuGet packages)
+set BUILD_ACTION=Copy mg-desktop build artifacts (NuGet packages)
+move *.nupkg %MG_BUILD_ARTIFACT_PATH%\mg-desktop
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA64%\MgDev\Release64
+echo [build]: Copy mg-desktop build artifacts (zip dist)
+SET BUILD_ACTION=Copy mg-desktop build artifacts (zip dist)
+7z a -mx9 %MG_BUILD_ARTIFACT_PATH%\mg-desktop\mg-desktop-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-net40-vc10-x64.zip Desktop DesktopSamples
+if "%errorlevel%"=="1" goto error
+popd
+
+REM ========================================= Instant Setup =========================================================
+pushd %MG_BUILD_AREA64%\Installer
+echo [build]: Prepare artifact directory
+SET BUILD_ACTION=Prepare artifact directory
+call build64.bat -a=prepare -source=%MG_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+popd
+
+if not exist %INSTANT_SETUP_SRC% goto checkout_instantsetup
+goto update_instantsetup
+:checkout_instantsetup
+echo [build]: svn checkout MgInstantSetup
+SET BUILD_ACTION=svn checkout MgInstantSetup
+svn co %INSTANT_SETUP_SVN_URL% %INSTANT_SETUP_SRC%
+if "%errorlevel%"=="1" goto error
+goto build_instantsetup
+
+:update_instantsetup
+REM We'll allow this to fail
+echo [build]: svn update MgInstantSetup
+pushd %INSTANT_SETUP_SRC%
+svn update
+popd
+
+:build_instantsetup
+echo [build]: MgInstantSetup
+pushd %INSTANT_SETUP_SRC%
+SET BUILD_ACTION=Building MgInstantSetup
+%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+if "%errorlevel%"=="1" goto error
+popd
+
+:copy_instantsetup_build_artifacts
+echo [build]: Copy MgInstantSetup build artifacts
+if not exist %MG_BUILD_OUTPUT64%\Setup mkdir %MG_BUILD_OUTPUT64%\Setup
+pushd %INSTANT_SETUP_SRC%\InstantSetup\bin\release
+copy /Y *.exe %MG_BUILD_OUTPUT64%\Setup
+copy /Y *.pdb %MG_BUILD_OUTPUT64%\Setup
+copy /Y *.dll %MG_BUILD_OUTPUT64%\Setup
+copy /Y *.config %MG_BUILD_OUTPUT64%\Setup
+popd
+
+:zip_mginstantsetup
+pushd %MG_BUILD_OUTPUT64%
+7z a %MG_BUILD_OUTPUT_ROOT64%\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-InstantSetup-x64.exe -mmt -mx5 -sfx7z.sfx .
+popd
+
+REM ========================================= MapGuide Installer ====================================================
+
+:build_installer
+pushd %MG_BUILD_AREA64%\Installer
+echo [build]: Generate installer file listings
+SET BUILD_ACTION=Generate installer file listings
+call build64.bat -a=generate -source=%MG_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+echo [build]: Build the installer
+SET BUILD_ACTION=Build the installer
+call build64.bat -source=%MG_BUILD_OUTPUT64% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR_BUILD% %RELEASE_LABEL64%"
+if "%errorlevel%"=="1" goto error
+
+move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64.exe %MG_BUILD_OUTPUT_ROOT64%
+popd
+goto end
+:error
+echo An error occurred while building MapGuide: %BUILD_ACTION%
+exit /b 1
+:end
+exit /b 0</command>
+    </hudson.tasks.BatchFile>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file


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

Added: bugtraq:number
   + true

Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x86/config.xml	                        (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.4 x86/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -0,0 +1,327 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <logRotator class="hudson.tasks.LogRotator">
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>RELEASE_LABEL</name>
+          <description></description>
+          <defaultValue>Final</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>WITH_ARCSDE</name>
+          <description></description>
+          <defaultValue>yes</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_MAJOR</name>
+          <description></description>
+          <defaultValue>2</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_MINOR</name>
+          <description></description>
+          <defaultValue>4</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_VER_BUILD</name>
+          <description></description>
+          <defaultValue>1</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>MG_BUILD_SRC</name>
+          <description></description>
+          <defaultValue>C:\working\sources\mg-2.4</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>FDO_SRC</name>
+          <description></description>
+          <defaultValue>C:\builds\fdo\3.7.0\x86_vc10\Fdo</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>INSTANT_SETUP_SRC</name>
+          <description></description>
+          <defaultValue>C:\working\sources\MgInstantSetup</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>CLEAR_WORKING_AREA</name>
+          <description></description>
+          <defaultValue>true</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <jdk>JDK6 32-bit</jdk>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.BatchFile>
+      <command>@echo off
+
+SET VCBEXTENSION=_vs10
+SET VC_COMPILER=vc100
+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 MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
+SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
+SET MG_BUILD_OUTPUT_ROOT=%MG_BUILD_ARTIFACT_PATH%\mapguide
+SET MG_BUILD_OUTPUT=%MG_BUILD_OUTPUT_ROOT%\%MG_VER_MAJOR_MINOR_BUILD%\x86\release
+SET MG_BUILD_AREA=%MG_BUILD_AREA%\mapguide\%MG_VER_MAJOR_MINOR_BUILD%\x86
+SET REVNUM_FILE=%MG_TOOL_PATH%\revnum.pl
+SET MG_STAMP_FILE=%MG_BUILD_ARTIFACT_PATH%\last_mapguide_%MG_VER_MAJOR_MINOR_BUILD%_revision_x86.txt
+SET BUILD_ACTION=
+
+echo =================== Env Vars for MapGuide =============================
+echo MG_VER_MAJOR_MINOR         = %MG_VER_MAJOR_MINOR%
+echo MG_VER_MAJOR_MINOR_BUILD   = %MG_VER_MAJOR_MINOR_BUILD%
+echo MG_BUILD_OUTPUT_ROOT       = %MG_BUILD_OUTPUT_ROOT%
+echo MG_BUILD_OUTPUT            = %MG_BUILD_OUTPUT%
+echo MG_BUILD_AREA              = %MG_BUILD_AREA%
+echo REVNUM_FILE                = %REVNUM_FILE%
+echo MG_STAMP_FILE              = %MG_STAMP_FILE%
+echo INSTANT_SETUP_SRC          = %INSTANT_SETUP_SRC%
+echo JAVA_HOME                  = %JAVA_HOME%
+echo ANT_HOME                   = %ANT_HOME%
+echo =======================================================================
+
+echo [prepare]: Cleaning out build artifacts
+if exist %MG_BUILD_OUTPUT% rd /S /Q %MG_BUILD_OUTPUT%
+
+pushd %MG_BUILD_SRC%\MgDev
+echo [prepare]: Noting SVN revision
+svn info . | perl %REVNUM_FILE% > revision.txt
+set /p MG_REVISION= < revision.txt
+copy /Y revision.txt %MG_STAMP_FILE%
+popd
+
+if "%CLEAR_WORKING_AREA%"=="false" (
+    echo [prepare]: Skip cleaning build area
+    goto build_mapguide
+)
+
+echo [prepare]: Cleaning out SVN metadata in build area
+if exist %MG_BUILD_AREA% for /R %MG_BUILD_AREA% %%X in (.svn) do (RD /S /Q %%X 2>nul)
+echo [prepare]: Cleaning out build area
+if exist %MG_BUILD_AREA% rd /S /Q %MG_BUILD_AREA%
+echo [prepare]: Re-creating output directories
+if not exist %MG_BUILD_AREA%\Installer mkdir %MG_BUILD_AREA%\Installer
+if not exist %MG_BUILD_AREA%\MgDev mkdir %MG_BUILD_AREA%\MgDev
+if not exist %MG_BUILD_ARTIFACT_PATH%\mg-desktop mkdir %MG_BUILD_ARTIFACT_PATH%\mg-desktop
+
+echo [prepare]: Exporting SVN working copy to build area (Installer)
+SET BUILD_ACTION=Exporting SVN working copy to build area (Installer)
+svn export %MG_BUILD_SRC%\Installer %MG_BUILD_AREA%\Installer --force
+if "%errorlevel%"=="1" goto error
+
+echo [prepare]: Copying SVN working copy to build area (MgDev)
+SET BUILD_ACTION=Copying SVN working copy to build area (MgDev)
+svn export %MG_BUILD_SRC%\MgDev %MG_BUILD_AREA%\MgDev --force
+if "%errorlevel%"=="1" goto error
+
+echo [prepare]: Overlaying SVN metadata
+REM Yeah, we're basically re-copying, but this will include missing SVN metadata that export obviously leaves out
+robocopy %MG_BUILD_SRC%\MgDev\Oem\fusion_build %MG_BUILD_AREA%\MgDev\Oem\fusion_build /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\localized %MG_BUILD_AREA%\MgDev\Web\src\localized /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\mapadmin %MG_BUILD_AREA%\MgDev\Web\src\mapadmin /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\UnitTest/WebTier\MapAgent\MapAgentForms %MG_BUILD_AREA%\MgDev\UnitTest/WebTier\MapAgent\MapAgentForms /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\mapviewerjava %MG_BUILD_AREA%\MgDev\Web\src\mapviewerjava /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\mapviewernet %MG_BUILD_AREA%\MgDev\Web\src\mapviewernet /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\mapviewerphp %MG_BUILD_AREA%\MgDev\Web\src\mapviewerphp /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\schemareport %MG_BUILD_AREA%\MgDev\Web\src\schemareport /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\stdicons %MG_BUILD_AREA%\MgDev\Web\src\stdicons /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Web\src\viewerfiles %MG_BUILD_AREA%\MgDev\Web\src\viewerfiles /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\dotnetsamples %MG_BUILD_AREA%\MgDev\Doc\samples\dotnetsamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\dotnetviewersample %MG_BUILD_AREA%\MgDev\Doc\samples\dotnetviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\javasamples %MG_BUILD_AREA%\MgDev\Doc\samples\javasamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\javaviewersample %MG_BUILD_AREA%\MgDev\Doc\samples\javaviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\phpsamples %MG_BUILD_AREA%\MgDev\Doc\samples\phpsamples /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\samples\phpviewersample %MG_BUILD_AREA%\MgDev\Doc\samples\phpviewersample /E /NFL /NDL /nc /ns /np /MT
+robocopy %MG_BUILD_SRC%\MgDev\Doc\viewerapi %MG_BUILD_AREA%\MgDev\Doc\viewerapi /E /NFL /NDL /nc /ns /np /MT
+
+echo [prepare]: Setup FDO in Oem
+cd %MG_BUILD_AREA%\MgDev\Oem\FDO
+xcopy /S /Y /I %FDO_SRC%\Inc Inc
+xcopy /S /Y /I %FDO_SRC%\Lib Lib
+xcopy /S /Y /I %FDO_SRC%\Bin Bin\Release
+xcopy /S /Y /I %FDO_SRC%\Bin\com\*.* Bin\Release\com
+REM For release we don't want pdbs and .net assemblies
+cd %MG_BUILD_AREA%\MgDev\Oem\FDO\Bin\Release
+del /Q OSGeo.FDO.*
+del /Q *.pdb
+
+REM echo [prepare]: Pre-process for 64-bit compilation with Windows SDK 7.1
+REM sed -i "s/\%%MSBUILD\%% InstallerPreReq\%%VS_SLN_SUFFIX\%%.sln/REM \%%MSBUILD\%% InstallerPreReq\%%VS_SLN_SUFFIX\%%.sln/g" %MG_BUILD_AREA%\Installer\build64.bat
+REM sed -i "s/REM call build64_vce.bat/call build64_vce.bat/g" %MG_BUILD_AREA%\Installer\build64.bat
+REM echo Updated - %MG_BUILD_AREA%\Installer\build64.bat
+
+:build_mapguide
+cd %MG_BUILD_AREA%\MgDev
+echo [build]: Stamp version numbers
+SET BUILD_ACTION=Stamp version numbers
+cscript updateversion.vbs /major:%MG_VER_MAJOR% /minor:%MG_VER_MINOR% /point:%MG_VER_BUILD% /build:%MG_REVISION%
+call stampassemblies.bat %MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%
+if "%errorlevel%"=="1" goto error
+
+REM ========================================= MapGuide ====================================================
+
+cd %MG_BUILD_AREA%\MgDev
+echo [build]: Set env vars
+call setenvironment.bat vc10
+
+echo [build]: Prep httpd source
+cd %MG_BUILD_AREA%\MgDev\Oem\LinuxApt
+if not exist httpd-2.2.21.tar 7z x httpd-2.2.21.tar.gz
+REM Extract regardless. We may have an incomplete directory here because windows is stingy
+REM about hidden/locked files when deleting a directory you're sure is clean
+7z x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
+
+echo [build]: build oem/server/web
+cd %MG_BUILD_AREA%\MgDev
+SET BUILD_ACTION=build oem/server/web
+call build.bat -o=%MG_BUILD_OUTPUT% -v
+if "%errorlevel%"=="1" goto error
+
+echo [build]: install files to build artifact directory
+SET BUILD_ACTION=install files to build artifact directory
+call build.bat -a=install -o=%MG_BUILD_OUTPUT%
+if "%errorlevel%"=="1" goto error
+
+REM Move fusion-selfbuild tools out of staging area
+pushd %MG_BUILD_OUTPUT%\fusion-selfbuild
+move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT%
+popd
+pushd %MG_BUILD_OUTPUT%
+rd /S /Q fusion-selfbuild
+popd
+
+REM ========================================= mg-desktop ====================================================
+:build_mgdesktop
+REM HACK: mg-desktop batch files not aware of new output dir so set old one
+SET MG_OUTPUT=%MG_BUILD_AREA%\MgDev\Release
+pushd %MG_BUILD_AREA%\MgDev
+echo [build]: mg-desktop
+SET BUILD_ACTION=Build mg-desktop
+call build_desktop.bat x86
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA%\MgDev\nuget
+echo [clean]: Nuget package temp files
+call package_clean.bat
+popd
+
+pushd %MG_BUILD_AREA%\MgDev
+echo [build]: Nuget packages
+call nuget_prepare.bat %MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION% x86
+SET BUILD_ACTION=Nuget packages
+call nuget_pack.bat x86
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA%\MgDev\nuget
+echo [build]: Copy mg-desktop build artifacts (NuGet packages)
+set BUILD_ACTION=Copy mg-desktop build artifacts (NuGet packages)
+move *.nupkg %MG_BUILD_ARTIFACT_PATH%\mg-desktop
+if "%errorlevel%"=="1" goto error
+popd
+
+pushd %MG_BUILD_AREA%\MgDev\Release
+echo [build]: Copy mg-desktop build artifacts (zip dist)
+SET BUILD_ACTION=Copy mg-desktop build artifacts (zip dist)
+7z a -mx9 %MG_BUILD_ARTIFACT_PATH%\mg-desktop\mg-desktop-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-net40-vc10-x86.zip Desktop DesktopSamples
+if "%errorlevel%"=="1" goto error
+popd
+
+REM ========================================= Instant Setup =========================================================
+pushd %MG_BUILD_AREA%\Installer
+echo [build]: Prepare artifact directory
+SET BUILD_ACTION=Prepare artifact directory
+call build.bat -a=prepare -source=%MG_BUILD_OUTPUT%
+if "%errorlevel%"=="1" goto error
+popd
+
+if not exist %INSTANT_SETUP_SRC% goto checkout_instantsetup
+goto update_instantsetup
+:checkout_instantsetup
+echo [build]: svn checkout MgInstantSetup
+SET BUILD_ACTION=svn checkout MgInstantSetup
+svn co %INSTANT_SETUP_SVN_URL% %INSTANT_SETUP_SRC%
+if "%errorlevel%"=="1" goto error
+goto build_instantsetup
+
+:update_instantsetup
+REM We'll allow this to fail
+echo [build]: svn update MgInstantSetup
+pushd %INSTANT_SETUP_SRC%
+svn update
+popd
+
+:build_instantsetup
+echo [build]: MgInstantSetup
+pushd %INSTANT_SETUP_SRC%
+SET BUILD_ACTION=Building MgInstantSetup
+%MSBUILD_NET35% /p:Configuration=Release;Platform="Any CPU" MgInstantSetup.sln
+if "%errorlevel%"=="1" goto error
+popd
+
+:copy_instantsetup_build_artifacts
+echo [build]: Copy MgInstantSetup build artifacts
+if not exist %MG_BUILD_OUTPUT%\Setup mkdir %MG_BUILD_OUTPUT%\Setup
+pushd %INSTANT_SETUP_SRC%\InstantSetup\bin\release
+copy /Y *.exe %MG_BUILD_OUTPUT%\Setup
+copy /Y *.pdb %MG_BUILD_OUTPUT%\Setup
+copy /Y *.dll %MG_BUILD_OUTPUT%\Setup
+copy /Y *.config %MG_BUILD_OUTPUT%\Setup
+popd
+
+:zip_mginstantsetup
+pushd %MG_BUILD_OUTPUT%
+7z a %MG_BUILD_OUTPUT_ROOT%\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-InstantSetup-x86.exe -mmt -mx5 -sfx7z.sfx .
+popd
+
+REM ========================================= MapGuide Installer ====================================================
+
+:build_installer
+pushd %MG_BUILD_AREA%\Installer
+echo [build]: Generate installer file listings
+SET BUILD_ACTION=Generate installer file listings
+call build.bat -a=generate -source=%MG_BUILD_OUTPUT%
+if "%errorlevel%"=="1" goto error
+
+echo [build]: Build the installer
+SET BUILD_ACTION=Build the installer
+call build.bat -source=%MG_BUILD_OUTPUT% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR_BUILD% %RELEASE_LABEL%"
+if "%errorlevel%"=="1" goto error
+
+move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86.exe %MG_BUILD_OUTPUT_ROOT%
+popd
+goto end
+:error
+echo An error occurred while building MapGuide: %BUILD_ACTION%
+exit /b 1
+:end
+exit /b 0</command>
+    </hudson.tasks.BatchFile>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>
\ No newline at end of file

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	2013-08-15 09:57:54 UTC (rev 7768)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -185,9 +185,19 @@
 echo [build]: Set env vars
 call setenvironment64.bat vc10
 
+echo [build]: Prep httpd source
+cd %MG_BUILD_AREA64%\MgDev\Oem\LinuxApt
+if not exist httpd-2.2.21.tar 7z x httpd-2.2.21.tar.gz
+REM Extract regardless. We may have an incomplete directory here because windows is stingy
+REM about hidden/locked files when deleting a directory you're sure is clean
+7z x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
+
 echo [build]: build oem/server/web
+cd %MG_BUILD_AREA64%\MgDev
 SET BUILD_ACTION=build oem/server/web
-call build64.bat -o=%MG_BUILD_OUTPUT64%
+call build64.bat -o=%MG_BUILD_OUTPUT64% -v
 if "%errorlevel%"=="1" goto error
 
 echo [build]: install files to build artifact directory
@@ -299,7 +309,7 @@
 
 echo [build]: Build the installer
 SET BUILD_ACTION=Build the installer
-call build64.bat -source=%MG_BUILD_OUTPUT64% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR% %RELEASE_LABEL64%"
+call build64.bat -source=%MG_BUILD_OUTPUT64% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR_BUILD% %RELEASE_LABEL64%"
 if "%errorlevel%"=="1" goto error
 
 move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64.exe %MG_BUILD_OUTPUT_ROOT64%

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	2013-08-15 09:57:54 UTC (rev 7768)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml	2013-08-16 11:11:59 UTC (rev 7769)
@@ -185,9 +185,19 @@
 echo [build]: Set env vars
 call setenvironment.bat vc10
 
+echo [build]: Prep httpd source
+cd %MG_BUILD_AREA%\MgDev\Oem\LinuxApt
+if not exist httpd-2.2.21.tar 7z x httpd-2.2.21.tar.gz
+REM Extract regardless. We may have an incomplete directory here because windows is stingy
+REM about hidden/locked files when deleting a directory you're sure is clean
+7z x httpd-2.2.21.tar
+type .\httpd-2.2.21\srclib\apr\include\apr.hw > .\httpd-2.2.21\srclib\apr\include\apr.h
+type .\httpd-2.2.21\srclib\apr-util\include\apu.hw > .\httpd-2.2.21\srclib\apr-util\include\apu.h
+
 echo [build]: build oem/server/web
+cd %MG_BUILD_AREA%\MgDev
 SET BUILD_ACTION=build oem/server/web
-call build.bat -o=%MG_BUILD_OUTPUT%
+call build.bat -o=%MG_BUILD_OUTPUT% -v
 if "%errorlevel%"=="1" goto error
 
 echo [build]: install files to build artifact directory
@@ -299,7 +309,7 @@
 
 echo [build]: Build the installer
 SET BUILD_ACTION=Build the installer
-call build.bat -source=%MG_BUILD_OUTPUT% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR% %RELEASE_LABEL%"
+call build.bat -source=%MG_BUILD_OUTPUT% -version=%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION% -name=MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86 -title="MapGuide Open Source %MG_VER_MAJOR_MINOR_BUILD% %RELEASE_LABEL%"
 if "%errorlevel%"=="1" goto error
 
 move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86.exe %MG_BUILD_OUTPUT_ROOT%



More information about the mapguide-commits mailing list