[mapguide-commits] r7429 - in trunk/Tools/JenkinsCI/jobs: FDO x64 FDO x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Mar 29 04:31:00 PDT 2013
Author: jng
Date: 2013-03-29 04:31:00 -0700 (Fri, 29 Mar 2013)
New Revision: 7429
Modified:
trunk/Tools/JenkinsCI/jobs/FDO x64/config.xml
trunk/Tools/JenkinsCI/jobs/FDO x86/config.xml
Log:
#2210: Parameterize the FDO job configurations. This allows us to bump versions and change file paths with minimal breakages. These jobs now also support overlaying binaries to the build output dir. This is mainly for the ArcSDE provider dlls, which we can't build.
Modified: trunk/Tools/JenkinsCI/jobs/FDO x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/jobs/FDO x64/config.xml 2013-03-28 17:53:14 UTC (rev 7428)
+++ trunk/Tools/JenkinsCI/jobs/FDO x64/config.xml 2013-03-29 11:31:00 UTC (rev 7429)
@@ -9,7 +9,52 @@
<artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
- <properties/>
+ <properties>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>BUILD_SRC64</name>
+ <description>FDO Source directory</description>
+ <defaultValue>C:\fdo-3.8-x64</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>BUILD_OUTPUT64</name>
+ <description>FDO build output directory</description>
+ <defaultValue>C:\builds\fdo\3.8\x64_vc10</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MYSQL_SDK64</name>
+ <description>MySQL Connector C SDK path</description>
+ <defaultValue>C:\fdo_rdbms_thirdparty\mysql_x64</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>ORACLE_SDK64</name>
+ <description>Oracle Instant Client SDK path</description>
+ <defaultValue>C:\fdo_rdbms_thirdparty\oracle_x64\instantclient\11.2\sdk</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_VERSION_64</name>
+ <description>FDO Version Number (major.minor.rev)</description>
+ <defaultValue>3.8.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE64</name>
+ <description>Path to store the last FDO svn revision</description>
+ <defaultValue>C:\builds\last_fdo_x64_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>REVNUM_FILE64</name>
+ <description>Path to revnum.pl script</description>
+ <defaultValue>C:\builds\revnum.pl</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_BIN_EXTRAS64</name>
+ <description>Path to FDO binaries to overlay on top of the build output</description>
+ <defaultValue>C:\builds\fdo_extras_x64</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ </properties>
<scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
@@ -21,38 +66,41 @@
<builders>
<hudson.tasks.BatchFile>
<command>@echo off
-SET BUILD_SRC=C:\fdo-3.7-x64
-SET BUILD_OUTPUT=C:\builds\fdo\3.7\x64_vc10
-SET FDOMYSQL=C:\fdo_rdbms_thirdparty\mysql_x64
-SET FDOORACLE=C:\fdo_rdbms_thirdparty\oracle_x64\instantclient\11.2\sdk
-if exist %BUILD_OUTPUT% rd /S /Q %BUILD_OUTPUT%
-pushd %BUILD_SRC%
+SET FDOMYSQL=%MYSQL_SDK64%
+SET FDOORACLE=%ORACLE_SDK64%
+if exist %BUILD_OUTPUT64% rd /S /Q %BUILD_OUTPUT64%
+pushd %BUILD_SRC64%
REM If we ever do implement CI build triggers, remove this update command
svn update .
-svn info . | perl C:\builds\revnum.pl > revision.txt
+svn info . | perl %REVNUM_FILE64% > revision.txt
set /p REVISION= < revision.txt
-copy /Y revision.txt C:\builds\last_fdo_x64_revision.txt
+copy /Y revision.txt %FDO_STAMP_FILE64%
echo [build]: Set env vars
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /release /x64
call setenvironment.bat x64 VC10
echo [build]: build thirdparty
-call build_thirdparty.bat -p=x64 -a=buildinstall -o=%BUILD_OUTPUT%
+call build_thirdparty.bat -p=x64 -a=buildinstall -o=%BUILD_OUTPUT64%
echo [build]: build core and providers
-call build.bat -p=x64 -a=buildinstall -o=%BUILD_OUTPUT%
+call build.bat -p=x64 -a=buildinstall -o=%BUILD_OUTPUT64%
+if not exists %FDO_BIN_EXTRAS64% goto pack
+pushd %FDO_BIN_EXTRAS64%
+copy /Y *.* %BUILD_OUTPUT64%\Fdo\Bin
+popd
+:pack
echo [build]: Pack files
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=fdo -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=shp -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sdf -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wfs -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wms -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=rdbms -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=mysql -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=odbc -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlspatial -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=gdal -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=kingoracle -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=ogr -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlite -b=%REVISION% -r=3.7.0
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=fdo -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=shp -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=sdf -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=wfs -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=wms -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=rdbms -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=mysql -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=odbc -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=sqlspatial -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=gdal -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=kingoracle -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=ogr -b=%REVISION% -r=%FDO_VERSION_64%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT64%\Fdo -o=%BUILD_OUTPUT64%\dist -w=sqlite -b=%REVISION% -r=%FDO_VERSION_64%
popd</command>
</hudson.tasks.BatchFile>
</builders>
Modified: trunk/Tools/JenkinsCI/jobs/FDO x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/jobs/FDO x86/config.xml 2013-03-28 17:53:14 UTC (rev 7428)
+++ trunk/Tools/JenkinsCI/jobs/FDO x86/config.xml 2013-03-29 11:31:00 UTC (rev 7429)
@@ -9,7 +9,52 @@
<artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
<keepDependencies>false</keepDependencies>
- <properties/>
+ <properties>
+ <hudson.model.ParametersDefinitionProperty>
+ <parameterDefinitions>
+ <hudson.model.StringParameterDefinition>
+ <name>BUILD_SRC</name>
+ <description>FDO Source directory</description>
+ <defaultValue>C:\fdo-3.8-x86</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>BUILD_OUTPUT</name>
+ <description>FDO build output directory</description>
+ <defaultValue>C:\builds\fdo\3.8\x86_vc10</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>MYSQL_SDK</name>
+ <description>MySQL Connector C SDK path (x86)</description>
+ <defaultValue>C:\fdo_rdbms_thirdparty\mysql</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>ORACLE_SDK</name>
+ <description>Oracle Instant Client SDK path (x86)</description>
+ <defaultValue>C:\fdo_rdbms_thirdparty\oracle\instant_client\11.2\sdk</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_VERSION</name>
+ <description>FDO Version Number (major.minor.rev)</description>
+ <defaultValue>3.8.0</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_STAMP_FILE</name>
+ <description>Path to store the last FDO svn revision</description>
+ <defaultValue>C:\builds\last_fdo_x86_revision.txt</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>REVNUM_FILE</name>
+ <description>Path to revnum.pl script</description>
+ <defaultValue>C:\builds\revnum.pl</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
+ <name>FDO_BIN_EXTRAS</name>
+ <description>Path to FDO binaries to overlay on top of the build output</description>
+ <defaultValue>C:\builds\fdo_extras_x86</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ </parameterDefinitions>
+ </hudson.model.ParametersDefinitionProperty>
+ </properties>
<scm class="hudson.scm.NullSCM"/>
<canRoam>true</canRoam>
<disabled>false</disabled>
@@ -21,37 +66,40 @@
<builders>
<hudson.tasks.BatchFile>
<command>@echo off
-SET BUILD_SRC=C:\fdo-3.7-x86
-SET BUILD_OUTPUT=C:\builds\fdo\3.7\x86_vc10
-SET FDOMYSQL=C:\fdo_rdbms_thirdparty\mysql
-SET FDOORACLE=C:\fdo_rdbms_thirdparty\oracle\instant_client\11.2\sdk
+SET FDOMYSQL=%MYSQL_SDK%
+SET FDOORACLE=%ORACLE_SDK%
if exist %BUILD_OUTPUT% rd /S /Q %BUILD_OUTPUT%
pushd %BUILD_SRC%
REM If we ever do implement CI build triggers, remove this update command
svn update .
-svn info . | perl C:\builds\revnum.pl > revision.txt
+svn info . | perl %REVNUM_FILE% > revision.txt
set /p REVISION= < revision.txt
-copy /Y revision.txt C:\builds\last_fdo_x86_revision.txt
+copy /Y revision.txt %FDO_STAMP_FILE%
echo [build]: Set env vars
call setenvironment.bat x86 VC10
echo [build]: build thirdparty
call build_thirdparty.bat -p=Win32 -a=buildinstall -o=%BUILD_OUTPUT%
echo [build]: build core and providers
call build.bat -p=Win32 -a=buildinstall -o=%BUILD_OUTPUT%
+if not exists %FDO_BIN_EXTRAS% goto pack
+pushd %FDO_BIN_EXTRAS%
+copy /Y *.* %BUILD_OUTPUT%\Fdo\Bin
+popd
+:pack
echo [build]: Pack files
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=fdo -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=shp -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sdf -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wfs -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wms -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=rdbms -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=mysql -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=odbc -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlspatial -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=gdal -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=kingoracle -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=ogr -b=%REVISION% -r=3.7.0
-rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlite -b=%REVISION% -r=3.7.0
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=fdo -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=shp -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sdf -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wfs -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=wms -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=rdbms -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=mysql -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=odbc -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlspatial -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=gdal -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=kingoracle -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=ogr -b=%REVISION% -r=%FDO_VERSION%
+rem call createtarzipbinfiles.bat -i=%BUILD_OUTPUT%\Fdo -o=%BUILD_OUTPUT%\dist -w=sqlite -b=%REVISION% -r=%FDO_VERSION%
popd</command>
</hudson.tasks.BatchFile>
</builders>
More information about the mapguide-commits
mailing list