[mapguide-commits] r8764 - in trunk/Tools/JenkinsCI: home/slave_win home/slave_win/jobs home/slave_win/jobs/FDO 4.0 x64 home/slave_win/jobs/FDO 4.0 x86 home/slave_win/jobs/MapGuide Open Source 3.0 x64 home/slave_win/jobs/MapGuide Open Source 3.0 x86 home/slave_win/jobs/MapGuide Open Source x64 home/slave_win/jobs/MapGuide Open Source x86 tools
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 24 05:17:06 PDT 2015
Author: jng
Date: 2015-09-24 05:17:06 -0700 (Thu, 24 Sep 2015)
New Revision: 8764
Added:
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x64/
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x86/
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x86/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x64/
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x86/
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x86/config.xml
Modified:
trunk/Tools/JenkinsCI/home/slave_win/config.xml
trunk/Tools/JenkinsCI/home/slave_win/hudson.plugins.msbuild.MsBuildBuilder.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
trunk/Tools/JenkinsCI/tools/setrevnums.bat
trunk/Tools/JenkinsCI/tools/svnupdate.bat
Log:
This is the Jenkins environment used to produce MGOS 3.0 and 2.6.1
Modified: trunk/Tools/JenkinsCI/home/slave_win/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/config.xml 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/home/slave_win/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -1,12 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
- <disabledAdministrativeMonitors/>
- <version>1.516</version>
+ <disabledAdministrativeMonitors>
+ <string>hudson.diagnosis.ReverseProxySetupMonitor</string>
+ </disabledAdministrativeMonitors>
+ <version>1.630</version>
<numExecutors>2</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
<authorizationStrategy class="hudson.security.AuthorizationStrategy$Unsecured"/>
<securityRealm class="hudson.security.SecurityRealm$None"/>
+ <disableRememberMe>false</disableRememberMe>
<projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
<workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir>
<buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
@@ -21,21 +24,10 @@
<home>C:\Program Files\Java\jdk1.6.0_45</home>
<properties/>
</jdk>
- <jdk>
- <name>JDK7 32-bit</name>
- <home>C:\Program Files (x86)\Java\jdk1.7.0_21</home>
- <properties/>
- </jdk>
- <jdk>
- <name>JDK7 64-bit</name>
- <home>C:\Program Files\Java\jdk1.7.0_21</home>
- <properties/>
- </jdk>
</jdks>
<viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
<myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
<clouds/>
- <slaves/>
<quietPeriod>5</quietPeriod>
<scmCheckoutRetryCount>0</scmCheckoutRetryCount>
<views>
@@ -61,7 +53,7 @@
</default>
<int>6</int>
<string>ANT_HOME</string>
- <string>C:\apache-ant-1.9.1</string>
+ <string>C:\tools\apache-ant-1.9.4</string>
<string>MG_BUILD_AREA</string>
<string>C:\working\build_area</string>
<string>MG_BUILD_ARTIFACT_PATH</string>
Modified: trunk/Tools/JenkinsCI/home/slave_win/hudson.plugins.msbuild.MsBuildBuilder.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/hudson.plugins.msbuild.MsBuildBuilder.xml 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/home/slave_win/hudson.plugins.msbuild.MsBuildBuilder.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -1,35 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?>
-<hudson.plugins.msbuild.MsBuildBuilder_-DescriptorImpl plugin="msbuild at 1.17">
+<hudson.plugins.msbuild.MsBuildBuilder_-DescriptorImpl plugin="msbuild at 1.24">
<installations>
<hudson.plugins.msbuild.MsBuildInstallation>
- <name>MSBUILD 2.0 x86</name>
- <home>C:\Windows\Microsoft.NET\Framework\v2.0.50727\msbuild.exe</home>
- <properties/>
- </hudson.plugins.msbuild.MsBuildInstallation>
- <hudson.plugins.msbuild.MsBuildInstallation>
- <name>MSBUILD 3.5 x86</name>
- <home>C:\Windows\Microsoft.NET\Framework\v3.5\msbuild.exe</home>
- <properties/>
- </hudson.plugins.msbuild.MsBuildInstallation>
- <hudson.plugins.msbuild.MsBuildInstallation>
<name>MSBUILD 4.0 x86</name>
<home>C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe</home>
<properties/>
</hudson.plugins.msbuild.MsBuildInstallation>
<hudson.plugins.msbuild.MsBuildInstallation>
- <name>MSBUILD 2.0 x64</name>
- <home>C:\Windows\Microsoft.NET\Framework64\v2.0.50727\msbuild.exe</home>
+ <name>MSBUILD 4.0 x64</name>
+ <home>C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe</home>
<properties/>
</hudson.plugins.msbuild.MsBuildInstallation>
<hudson.plugins.msbuild.MsBuildInstallation>
- <name>MSBUILD 3.5 x64</name>
- <home>C:\Windows\Microsoft.NET\Framework64\v3.5\msbuild.exe</home>
+ <name>MSBuild 14.0</name>
+ <home>C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild.exe</home>
<properties/>
</hudson.plugins.msbuild.MsBuildInstallation>
- <hudson.plugins.msbuild.MsBuildInstallation>
- <name>MSBUILD 4.0 x64</name>
- <home>C:\Windows\Microsoft.NET\Framework64\v4.0.30319\msbuild.exe</home>
- <properties/>
- </hudson.plugins.msbuild.MsBuildInstallation>
</installations>
</hudson.plugins.msbuild.MsBuildBuilder_-DescriptorImpl>
\ No newline at end of file
Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x64/config.xml (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x64/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -0,0 +1,182 @@
+<?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-4.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_VERSION64</name>
+ <description>FDO Version Number (major.minor.rev)</description>
+ <defaultValue>4.0.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>CLEAR_WORKING_AREA</name>
+ <description></description>
+ <defaultValue>true</defaultValue>
+ </hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE_SOURCE64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\fdo_40_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>FDO_RUN_UNIT_TESTS64</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/>
+ <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 FDOPOSTGRESQL=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\pgsql
+SET FDO_BUILD_OUTPUT64=%MG_BUILD_ARTIFACT_PATH%\fdo\%FDO_VERSION64%\x64
+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 FDOPOSTGRESQL = %FDOPOSTGRESQL%
+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 -q
+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
+
+:build_fdo
+echo [prepare]: Noting SVN revision
+set /p REVISION= < "%FDO_STAMP_FILE_SOURCE64%"
+copy /Y "%FDO_STAMP_FILE_SOURCE64%" "%FDO_STAMP_FILE64%"
+
+REM Need to use x86_amd64 because the 64-bit compiler in VS 2012 express is a cross-compiler
+pushd %FDO_WORKING_AREA64%
+echo [build]: Set env vars
+call setenvironment.bat x86_amd64
+
+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
+
+if "%FDO_RUN_UNIT_TESTS64%"=="false" goto end
+:fdo_unit_tests
+pushd %FDO_WORKING_AREA64%\Fdo\Unmanaged\Bin\Win64\Release
+UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\fdocore_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\SHP\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\shp_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\SDF\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\sdf_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\SQLite\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\sqlite_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\OGR\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\ogr_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\GDAL\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\gdal_unittest.log
+popd
+pushd %FDO_WORKING_AREA64%\Providers\WMS\Src\UnitTest
+..\..\Bin\Win64\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT64%\wms_unittest.log
+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 3.0 x64</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x86/config.xml (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 4.0 x86/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -0,0 +1,183 @@
+<?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-4.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_VERSION</name>
+ <description>FDO Version Number (major.minor.rev)</description>
+ <defaultValue>4.0.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>CLEAR_WORKING_AREA</name>
+ <description></description>
+ <defaultValue>true</defaultValue>
+ </hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE_SOURCE</name>
+ <description></description>
+ <defaultValue>C:\working\sources\fdo_40_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>FDO_RUN_UNIT_TESTS</name>
+ <description></description>
+ <defaultValue>true</defaultValue>
+ </hudson.model.BooleanParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ </properties>
+ <scm class="hudson.scm.NullSCM"/>
+ <quietPeriod>2700</quietPeriod>
+ <canRoam>true</canRoam>
+ <disabled>false</disabled>
+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+ <jdk>(Default)</jdk>
+ <triggers/>
+ <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 FDOPOSTGRESQL=%MG_LIB_ROOT%\fdo_rdbms_thirdparty\pgsql
+SET FDO_BUILD_OUTPUT=%MG_BUILD_ARTIFACT_PATH%\fdo\%FDO_VERSION%\x86
+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 FDOPOSTGRESQL = %FDOPOSTGRESQL%
+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 -q
+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
+
+:build_fdo
+echo [prepare]: Noting SVN revision
+set /p REVISION= < "%FDO_STAMP_FILE_SOURCE%"
+copy /Y "%FDO_STAMP_FILE_SOURCE%" "%FDO_STAMP_FILE%"
+
+pushd %FDO_WORKING_AREA%
+echo [build]: Set env vars
+call setenvironment.bat x86
+
+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
+
+if "%FDO_RUN_UNIT_TESTS%"=="false" goto end
+:fdo_unit_tests
+pushd %FDO_WORKING_AREA%\Fdo\Unmanaged\Bin\Win32\Release
+UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\fdocore_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\SHP\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\shp_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\SDF\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\sdf_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\SQLite\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\sqlite_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\OGR\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\ogr_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\GDAL\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\gdal_unittest.log
+popd
+pushd %FDO_WORKING_AREA%\Providers\WMS\Src\UnitTest
+..\..\Bin\Win32\Release\UnitTest.exe -NoWAIT > %FDO_BUILD_OUTPUT%\wms_unittest.log
+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 3.0 x86</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x64/config.xml (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x64/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -0,0 +1,319 @@
+<?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>3</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_VER_MINOR</name>
+ <description></description>
+ <defaultValue>0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_VER_BUILD</name>
+ <description></description>
+ <defaultValue>0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_BUILD_SRC64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mg-3.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_SRC64</name>
+ <description></description>
+ <defaultValue>C:\builds\fdo\4.0.0\x64\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>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_30_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </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/>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.BatchFile>
+ <command>@echo off
+
+SET BUILD_ACTION=Setting Visual Studio env vars
+SET VCBEXTENSION=_vs12
+SET VC_COMPILER=vc110
+SET ACTIVENAMECHECK="Microsoft Visual Studio 11"
+SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 11.0\VC"
+if exist %ACTIVEPATHCHECK% goto VSExist
+SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC"
+if exist %ACTIVEPATHCHECK% goto VSExist
+goto error
+
+REM Use x86_amd64 because 64-bit compiler in VS2012 express is a cross-compiler
+:VSExist
+call %ACTIVEPATHCHECK%\vcvarsall.bat x86_amd64
+
+REM Sigh! We can't seem to reference this from Jenkins
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
+
+SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
+SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
+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%
+
+echo [prepare]: Noting SVN revision
+set /p MG_REVISION64= < "%MG_STAMP_FILE_SOURCE64%"
+copy /Y "%MG_STAMP_FILE_SOURCE64%" "%MG_STAMP_FILE64%"
+
+if "%CLEAR_WORKING_AREA%"=="false" (
+ echo [prepare]: Skip cleaning build area
+ goto build_mapguide
+)
+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 -q
+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 -q
+if "%errorlevel%"=="1" goto error
+
+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
+
+: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
+
+echo [build]: build oem/server/web
+cd %MG_BUILD_AREA64%\MgDev
+SET BUILD_ACTION=build oem/server/web
+call build.bat
+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_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+REM Move fusion-selfbuild tools out of staging area
+pushd %MG_BUILD_OUTPUT64%\fusion-selfbuild
+move /Y fusion-%MG_VER_MAJOR_MINOR_BUILD%-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-vc11-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 build.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_NET40% /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%\out\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 CS-Map Server Web Setup
+popd
+
+:zip_testpack
+pushd %MG_BUILD_OUTPUT64%
+7z a %MG_BUILD_OUTPUT_ROOT64%\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-TestSuite-x64.exe -mmt -mx5 -sfx7z.sfx Test
+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 build.bat -a=generate -source=%MG_BUILD_OUTPUT64%
+if "%errorlevel%"=="1" goto error
+
+echo [build]: Build the installer
+SET BUILD_ACTION=Build the installer
+call build.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>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Test MapGuide x64</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
+ </publishers>
+ <buildWrappers/>
+</project>
\ No newline at end of file
Added: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x86/config.xml (rev 0)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 3.0 x86/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -0,0 +1,319 @@
+<?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>3</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_VER_MINOR</name>
+ <description></description>
+ <defaultValue>0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_VER_BUILD</name>
+ <description></description>
+ <defaultValue>0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_BUILD_SRC</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mg-3.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_SRC</name>
+ <description></description>
+ <defaultValue>C:\builds\fdo\4.0.0\x86\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>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_30_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </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/>
+ <concurrentBuild>false</concurrentBuild>
+ <builders>
+ <hudson.tasks.BatchFile>
+ <command>@echo off
+
+SET BUILD_ACTION=Setting Visual Studio env vars
+SET VCBEXTENSION=_vs12
+SET VC_COMPILER=vc110
+SET ACTIVENAMECHECK="Microsoft Visual Studio 11"
+SET ACTIVEPATHCHECK="C:\Program Files\Microsoft Visual Studio 11.0\VC"
+if exist %ACTIVEPATHCHECK% goto VSExist
+SET ACTIVEPATHCHECK="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC"
+if exist %ACTIVEPATHCHECK% goto VSExist
+goto error
+
+:VSExist
+call %ACTIVEPATHCHECK%\vcvarsall.bat x86
+
+REM Sigh! We can't seem to reference this from Jenkins
+SET MSBUILD_NET40=C:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
+
+SET MG_VER_MAJOR_MINOR=%MG_VER_MAJOR%.%MG_VER_MINOR%
+SET MG_VER_MAJOR_MINOR_BUILD=%MG_VER_MAJOR_MINOR%.%MG_VER_BUILD%
+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%
+
+echo [prepare]: Noting SVN revision
+set /p MG_REVISION= < "%MG_STAMP_FILE_SOURCE%"
+copy /Y "%MG_STAMP_FILE_SOURCE%" "%MG_STAMP_FILE%"
+
+if "%CLEAR_WORKING_AREA%"=="false" (
+ echo [prepare]: Skip cleaning build area
+ goto build_mapguide
+)
+
+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 -q
+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 -q
+if "%errorlevel%"=="1" goto error
+
+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
+
+: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
+
+echo [build]: build oem/server/web
+cd %MG_BUILD_AREA%\MgDev
+SET BUILD_ACTION=build oem/server/web
+call build.bat
+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-%MG_VER_MAJOR_MINOR_BUILD%-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-vc11-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_NET40% /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%\out\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 CS-Map Server Web Setup
+popd
+
+:zip_testpack
+pushd %MG_BUILD_OUTPUT%
+7z a %MG_BUILD_OUTPUT_ROOT%\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-TestSuite-x86.exe -mmt -mx5 -sfx7z.sfx Test
+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>
+ <hudson.tasks.BuildTrigger>
+ <childProjects>Test MapGuide x86</childProjects>
+ <threshold>
+ <name>SUCCESS</name>
+ <ordinal>0</ordinal>
+ <color>BLUE</color>
+ <completeBuild>true</completeBuild>
+ </threshold>
+ </hudson.tasks.BuildTrigger>
+ </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 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL64</name>
<description></description>
- <defaultValue>Preview2</defaultValue>
+ <defaultValue>Beta1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
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 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml 2015-09-24 12:17:06 UTC (rev 8764)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL</name>
<description></description>
- <defaultValue>Preview2</defaultValue>
+ <defaultValue>Beta1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
Modified: trunk/Tools/JenkinsCI/tools/setrevnums.bat
===================================================================
--- trunk/Tools/JenkinsCI/tools/setrevnums.bat 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/tools/setrevnums.bat 2015-09-24 12:17:06 UTC (rev 8764)
@@ -1,6 +1,9 @@
@echo off
SET MG_SOURCES_DIR=C:\working\sources
svn info "%MG_SOURCES_DIR%\fdo-3.9" | perl revnum.pl > "%MG_SOURCES_DIR%\fdo_39_revision.txt"
+svn info "%MG_SOURCES_DIR%\fdo-4.0" | perl revnum.pl > "%MG_SOURCES_DIR%\fdo_40_revision.txt"
svn info "%MG_SOURCES_DIR%\fdo-trunk" | perl revnum.pl > "%MG_SOURCES_DIR%\fdo_trunk_revision.txt"
svn info "%MG_SOURCES_DIR%\mg-2.6\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_26_revision.txt"
+svn info "%MG_SOURCES_DIR%\mg-3.0\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_30_revision.txt"
svn info "%MG_SOURCES_DIR%\mg-trunk\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_trunk_revision.txt"
+svn info "%MG_SOURCES_DIR%\diet_mapguide\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_31_revision.txt"
Modified: trunk/Tools/JenkinsCI/tools/svnupdate.bat
===================================================================
--- trunk/Tools/JenkinsCI/tools/svnupdate.bat 2015-09-23 12:29:06 UTC (rev 8763)
+++ trunk/Tools/JenkinsCI/tools/svnupdate.bat 2015-09-24 12:17:06 UTC (rev 8764)
@@ -1,9 +1,15 @@
@echo off
SET MG_SOURCES_DIR=C:\working\sources
svn update "%MG_SOURCES_DIR%\fdo-3.9"
+svn update "%MG_SOURCES_DIR%\fdo-4.0"
svn update "%MG_SOURCES_DIR%\fdo-trunk"
svn update "%MG_SOURCES_DIR%\mg-2.6\Installer"
svn update "%MG_SOURCES_DIR%\mg-2.6\MgDev"
+svn update "%MG_SOURCES_DIR%\mg-3.0\Installer"
+svn update "%MG_SOURCES_DIR%\mg-3.0\MgDev"
svn update "%MG_SOURCES_DIR%\mg-trunk\Installer"
svn update "%MG_SOURCES_DIR%\mg-trunk\MgDev"
+svn update "%MG_SOURCES_DIR%\diet_mapguide\Installer"
+svn update "%MG_SOURCES_DIR%\diet_mapguide\MgDev"
+svn update "%MG_SOURCES_DIR%\diet_oem"
svn update "%MG_SOURCES_DIR%\MgInstantSetup"
More information about the mapguide-commits
mailing list