[mapguide-commits] r8272 - in trunk/Tools/JenkinsCI/home/slave_win/jobs: FDO 3.9 x64 FDO 3.9 x86 FDO x64 FDO x86 Maestro trunk MapGuide Open Source 2.6 x64 MapGuide Open Source 2.6 x86 MapGuide Open Source x64 MapGuide Open Source x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jul 1 06:31:10 PDT 2014
Author: jng
Date: 2014-07-01 06:31:10 -0700 (Tue, 01 Jul 2014)
New Revision: 8272
Modified:
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 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 trunk/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x64/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 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:
Jenkins job updates. Sync MapGuide 2.6 jobs to trunk, fix fusion build tools deployment and make FDO jobs do quiet exports.
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x64/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x64/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -84,7 +84,7 @@
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
+svn export %FDO_BUILD_SRC64% %FDO_WORKING_AREA64% --force -q
if "%errorlevel%"=="1" goto error
REM Copy non-UAC UpdateVersion
@@ -138,7 +138,7 @@
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_OUTPUT%\fdocore_unittest.log
+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
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x86/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO 3.9 x86/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -84,7 +84,7 @@
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
+svn export %FDO_BUILD_SRC% %FDO_WORKING_AREA% --force -q
if "%errorlevel%"=="1" goto error
REM Copy non-UAC UpdateVersion
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x64/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -32,6 +32,11 @@
<description></description>
<defaultValue>C:\working\sources\fdo_trunk_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>
@@ -41,7 +46,7 @@
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>(Default)</jdk>
- <triggers class="vector"/>
+ <triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
@@ -79,7 +84,7 @@
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
+svn export %FDO_BUILD_SRC64% %FDO_WORKING_AREA64% --force -q
if "%errorlevel%"=="1" goto error
REM Copy non-UAC UpdateVersion
@@ -129,7 +134,29 @@
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\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
@@ -144,6 +171,7 @@
<name>SUCCESS</name>
<ordinal>0</ordinal>
<color>BLUE</color>
+ <completeBuild>true</completeBuild>
</threshold>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/FDO x86/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -32,6 +32,11 @@
<description></description>
<defaultValue>C:\working\sources\fdo_trunk_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>
@@ -41,7 +46,7 @@
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>(Default)</jdk>
- <triggers class="vector"/>
+ <triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
@@ -79,7 +84,7 @@
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
+svn export %FDO_BUILD_SRC% %FDO_WORKING_AREA% --force -q
if "%errorlevel%"=="1" goto error
REM Copy non-UAC UpdateVersion
@@ -112,6 +117,7 @@
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%
@@ -128,7 +134,29 @@
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\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
@@ -143,6 +171,7 @@
<name>SUCCESS</name>
<ordinal>0</ordinal>
<color>BLUE</color>
+ <completeBuild>true</completeBuild>
</threshold>
</hudson.tasks.BuildTrigger>
</publishers>
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>VersionLabel</name>
<description>The release version label</description>
- <defaultValue>6.0a2</defaultValue>
+ <defaultValue>6.0a3</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>BASE_VERSION</name>
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x64/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x64/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x64/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL64</name>
<description></description>
- <defaultValue>Beta1</defaultValue>
+ <defaultValue>RC1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
@@ -164,7 +164,7 @@
:build_mapguide
cd %MG_BUILD_AREA64%\MgDev
echo [build]: Stamp version numbers
-SET BUILD_ACTION=Stamp version numbers
+SET BUILD_ACTION=Stamp version numbers %MG_VER_MAJOR%.%MG_VER_MINOR%.%MG_VER_BUILD%.%MG_REVISION64%
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
@@ -188,7 +188,7 @@
REM Move fusion-selfbuild tools out of staging area
pushd %MG_BUILD_OUTPUT64%\fusion-selfbuild
-move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT64%
+move /Y fusion-%MG_VER_MAJOR_MINOR_BUILD%-buildtools.zip %MG_BUILD_OUTPUT_ROOT64%
popd
pushd %MG_BUILD_OUTPUT64%
rd /S /Q fusion-selfbuild
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x86/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x86/config.xml 2014-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source 2.6 x86/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL</name>
<description></description>
- <defaultValue>Beta1</defaultValue>
+ <defaultValue>RC1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
@@ -163,7 +163,7 @@
:build_mapguide
cd %MG_BUILD_AREA%\MgDev
-echo [build]: Stamp version numbers
+echo [build]: Stamp version numbers %MG_VER_MAJOR%.%MG_VER_MINOR%.%MG_VER_BUILD%.%MG_REVISION%
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%
@@ -188,7 +188,7 @@
REM Move fusion-selfbuild tools out of staging area
pushd %MG_BUILD_OUTPUT%\fusion-selfbuild
-move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT%
+move /Y fusion-%MG_VER_MAJOR_MINOR_BUILD%-buildtools.zip %MG_BUILD_OUTPUT_ROOT%
popd
pushd %MG_BUILD_OUTPUT%
rd /S /Q fusion-selfbuild
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-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL64</name>
<description></description>
- <defaultValue>Beta1</defaultValue>
+ <defaultValue>Preview1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
@@ -62,6 +62,11 @@
<description></description>
<defaultValue>C:\working\sources\mapguide_trunk_revision.txt</defaultValue>
</hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>MG_RUN_UNIT_TESTS64</name>
+ <description></description>
+ <defaultValue>true</defaultValue>
+ </hudson.model.BooleanParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -71,7 +76,7 @@
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>JDK6 64-bit</jdk>
- <triggers class="vector"/>
+ <triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
@@ -114,6 +119,7 @@
echo INSTANT_SETUP_SRC = %INSTANT_SETUP_SRC%
echo JAVA_HOME = %JAVA_HOME%
echo ANT_HOME = %ANT_HOME%
+echo MG_RUN_UNIT_TESTS64 = %MG_RUN_UNIT_TESTS64%
echo =======================================================================
echo [prepare]: Cleaning out build artifacts
@@ -127,9 +133,6 @@
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
@@ -139,35 +142,14 @@
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
+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
+svn export %MG_BUILD_SRC64%\MgDev %MG_BUILD_AREA64%\MgDev --force -q
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\samples\ol2samples %MG_BUILD_AREA64%\MgDev\Doc\samples\ol2samples /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
@@ -206,7 +188,7 @@
REM Move fusion-selfbuild tools out of staging area
pushd %MG_BUILD_OUTPUT64%\fusion-selfbuild
-move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT64%
+move /Y fusion-%MG_VER_MAJOR_MINOR_BUILD%-buildtools.zip %MG_BUILD_OUTPUT_ROOT64%
popd
pushd %MG_BUILD_OUTPUT64%
rd /S /Q fusion-selfbuild
@@ -313,7 +295,14 @@
move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION64%-%RELEASE_LABEL64%-x64.exe %MG_BUILD_OUTPUT_ROOT64%
popd
+
+if "%MG_RUN_UNIT_TESTS64%"=="false" goto end
+:server_unit_test
+pushd %MG_BUILD_AREA64%\MgDev\Server\bin\Release64
+mgserver.exe test
+popd
goto end
+
:error
echo An error occurred while building MapGuide: %BUILD_ACTION%
exit /b 1
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-06-30 14:38:48 UTC (rev 8271)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml 2014-07-01 13:31:10 UTC (rev 8272)
@@ -15,7 +15,7 @@
<hudson.model.StringParameterDefinition>
<name>RELEASE_LABEL</name>
<description></description>
- <defaultValue>Beta1</defaultValue>
+ <defaultValue>Preview1</defaultValue>
</hudson.model.StringParameterDefinition>
<hudson.model.StringParameterDefinition>
<name>WITH_ARCSDE</name>
@@ -62,6 +62,11 @@
<description></description>
<defaultValue>C:\working\sources\mapguide_trunk_revision.txt</defaultValue>
</hudson.model.StringParameterDefinition>
+ <hudson.model.BooleanParameterDefinition>
+ <name>MG_RUN_UNIT_TESTS</name>
+ <description></description>
+ <defaultValue>true</defaultValue>
+ </hudson.model.BooleanParameterDefinition>
</parameterDefinitions>
</hudson.model.ParametersDefinitionProperty>
</properties>
@@ -71,7 +76,7 @@
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<jdk>JDK6 32-bit</jdk>
- <triggers class="vector"/>
+ <triggers/>
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
@@ -113,6 +118,7 @@
echo INSTANT_SETUP_SRC = %INSTANT_SETUP_SRC%
echo JAVA_HOME = %JAVA_HOME%
echo ANT_HOME = %ANT_HOME%
+echo MG_RUN_UNIT_TESTS = %MG_RUN_UNIT_TESTS%
echo =======================================================================
echo [prepare]: Cleaning out build artifacts
@@ -127,8 +133,6 @@
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
@@ -138,35 +142,14 @@
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
+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
+svn export %MG_BUILD_SRC%\MgDev %MG_BUILD_AREA%\MgDev --force -q
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\samples\ol2samples %MG_BUILD_AREA%\MgDev\Doc\samples\ol2samples /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
@@ -205,7 +188,7 @@
REM Move fusion-selfbuild tools out of staging area
pushd %MG_BUILD_OUTPUT%\fusion-selfbuild
-move /Y fusion-buildtools.zip %MG_BUILD_OUTPUT_ROOT%
+move /Y fusion-%MG_VER_MAJOR_MINOR_BUILD%-buildtools.zip %MG_BUILD_OUTPUT_ROOT%
popd
pushd %MG_BUILD_OUTPUT%
rd /S /Q fusion-selfbuild
@@ -312,7 +295,14 @@
move /Y Output\en-US\MapGuideOpenSource-%MG_VER_MAJOR_MINOR_BUILD%.%MG_REVISION%-%RELEASE_LABEL%-x86.exe %MG_BUILD_OUTPUT_ROOT%
popd
+
+if "%MG_RUN_UNIT_TESTS%"=="false" goto end
+:server_unit_test
+pushd %MG_BUILD_AREA%\MgDev\Server\bin\Release
+mgserver.exe test
+popd
goto end
+
:error
echo An error occurred while building MapGuide: %BUILD_ACTION%
exit /b 1
More information about the mapguide-commits
mailing list