[mapguide-commits] r8023 - in trunk/Tools/JenkinsCI: home/slave_win/jobs/FDO 3.8 x64 home/slave_win/jobs/FDO 3.8 x86 home/slave_win/jobs/FDO x64 home/slave_win/jobs/FDO x86 home/slave_win/jobs/Maestro 5.0.x home/slave_win/jobs/MapGuide Open Source 2.5 x64 home/slave_win/jobs/MapGuide Open Source 2.5 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
Wed Apr 9 08:39:35 PDT 2014
Author: jng
Date: 2014-04-09 08:39:35 -0700 (Wed, 09 Apr 2014)
New Revision: 8023
Added:
trunk/Tools/JenkinsCI/tools/setrevnums.bat
trunk/Tools/JenkinsCI/tools/svnupdate.bat
Modified:
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x86/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml
Log:
Build job updates to prepare for 2.6 release cycle. Main change is pre-stamp the revision files after a batch svn update so that there is no lock contention on the svn working copies for the latest revision number. Instead these build jobs can source this number from the pre-stamped files.
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x64/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x64/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -20,13 +20,18 @@
<hudson.model.StringParameterDefinition>
<name>FDO_VERSION64</name>
<description>FDO Version Number (major.minor.rev)</description>
- <defaultValue>3.8.1</defaultValue>
+ <defaultValue>3.8.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_38_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -89,12 +94,8 @@
: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
+set /p REVISION= < "%FDO_STAMP_FILE_SOURCE64%"
+copy /Y "%FDO_STAMP_FILE_SOURCE64%" "%FDO_STAMP_FILE64%"
pushd %FDO_WORKING_AREA64%
echo [build]: Set env vars
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x86/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.8 x86/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -20,13 +20,18 @@
<hudson.model.StringParameterDefinition>
<name>FDO_VERSION</name>
<description>FDO Version Number (major.minor.rev)</description>
- <defaultValue>3.8.1</defaultValue>
+ <defaultValue>3.8.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_38_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -89,12 +94,8 @@
: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
+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
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -27,6 +27,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE_SOURCE64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\fdo_trunk_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -85,12 +90,8 @@
: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
+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%
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -27,6 +27,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE_SOURCE</name>
+ <description></description>
+ <defaultValue>C:\working\sources\fdo_trunk_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -85,12 +90,8 @@
: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
+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
Modified: 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 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>VersionLabel</name>
<description>The release version label</description>
- <defaultValue>5.0.1</defaultValue>
+ <defaultValue>5.0.2</defaultValue>
</hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x64/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -35,7 +35,7 @@
<hudson.model.StringParameterDefinition>
<name>MG_VER_BUILD</name>
<description></description>
- <defaultValue>2</defaultValue>
+ <defaultValue>3</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>MG_BUILD_SRC64</name>
@@ -45,7 +45,7 @@
<hudson.model.StringParameterDefinition>
<name>FDO_SRC64</name>
<description></description>
- <defaultValue>C:\builds\fdo\3.8.1\x64_vc10\Fdo</defaultValue>
+ <defaultValue>C:\builds\fdo\3.8.0\x64_vc10\Fdo</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>INSTANT_SETUP_SRC</name>
@@ -57,6 +57,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_25_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -104,12 +109,9 @@
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
+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
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.5 x86/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -35,7 +35,7 @@
<hudson.model.StringParameterDefinition>
<name>MG_VER_BUILD</name>
<description></description>
- <defaultValue>2</defaultValue>
+ <defaultValue>3</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>MG_BUILD_SRC</name>
@@ -45,7 +45,7 @@
<hudson.model.StringParameterDefinition>
<name>FDO_SRC</name>
<description></description>
- <defaultValue>C:\builds\fdo\3.8.1\x86_vc10\Fdo</defaultValue>
+ <defaultValue>C:\builds\fdo\3.8.0\x86_vc10\Fdo</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>INSTANT_SETUP_SRC</name>
@@ -57,6 +57,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_25_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -104,12 +109,9 @@
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
+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
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -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>
@@ -57,6 +57,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE64</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_trunk_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -114,12 +119,9 @@
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
+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
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml 2014-04-09 14:20:52 UTC (rev 8022)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml 2014-04-09 15:39:35 UTC (rev 8023)
@@ -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>
@@ -57,6 +57,11 @@
<description></description>
<defaultValue>true</defaultValue>
</hudson.model.BooleanParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MG_STAMP_FILE_SOURCE</name>
+ <description></description>
+ <defaultValue>C:\working\sources\mapguide_trunk_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -113,12 +118,9 @@
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
+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
Added: trunk/Tools/JenkinsCI/tools/setrevnums.bat
===================================================================
--- trunk/Tools/JenkinsCI/tools/setrevnums.bat (rev 0)
+++ trunk/Tools/JenkinsCI/tools/setrevnums.bat 2014-04-09 15:39:35 UTC (rev 8023)
@@ -0,0 +1,6 @@
+ at echo off
+SET MG_SOURCES_DIR=C:\working\sources
+svn info "%MG_SOURCES_DIR%\fdo-3.8" | perl revnum.pl > "%MG_SOURCES_DIR%\fdo_38_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.5\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_25_revision.txt"
+svn info "%MG_SOURCES_DIR%\mg-trunk\MgDev" | perl revnum.pl > "%MG_SOURCES_DIR%\mapguide_trunk_revision.txt"
Added: trunk/Tools/JenkinsCI/tools/svnupdate.bat
===================================================================
--- trunk/Tools/JenkinsCI/tools/svnupdate.bat (rev 0)
+++ trunk/Tools/JenkinsCI/tools/svnupdate.bat 2014-04-09 15:39:35 UTC (rev 8023)
@@ -0,0 +1,8 @@
+SET MG_SOURCES_DIR=C:\working\sources
+svn update "%MG_SOURCES_DIR%\fdo-3.8"
+svn update "%MG_SOURCES_DIR%\fdo-trunk"
+svn update "%MG_SOURCES_DIR%\mg-2.5\Installer"
+svn update "%MG_SOURCES_DIR%\mg-2.5\MgDev"
+svn update "%MG_SOURCES_DIR%\mg-trunk\Installer"
+svn update "%MG_SOURCES_DIR%\mg-trunk\MgDev"
+svn update "%MG_SOURCES_DIR%\MgInstantSetup"
More information about the mapguide-commits
mailing list