[mapguide-commits] r7885 - in trunk/Tools/JenkinsCI/home/slave_win/jobs: Maestro 5.0.x Maestro trunk
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 30 09:48:21 PDT 2013
Author: jng
Date: 2013-09-30 09:48:20 -0700 (Mon, 30 Sep 2013)
New Revision: 7885
Modified:
trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml
trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
Log:
Maestro CI job cleanup
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 2013-09-30 16:31:04 UTC (rev 7884)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro 5.0.x/config.xml 2013-09-30 16:48:20 UTC (rev 7885)
@@ -52,13 +52,13 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%
+ <command>pushd "%WORKSPACE%"
rd /S /Q out
popd
-pushd %WORKSPACE%\Properties
-%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:5.0.0.%SVN_REVISION% GlobalAssemblyInfo.cs
+pushd "%WORKSPACE%\Properties"
+%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:5.0.1.%SVN_REVISION% GlobalAssemblyInfo.cs
popd
-pushd %WORKSPACE%\SDK
+pushd "%WORKSPACE%\SDK"
rd /S /Q bin
popd</command>
</hudson.tasks.BatchFile>
@@ -70,37 +70,37 @@
<continueOnBuildFailure>false</continueOnBuildFailure>
</hudson.plugins.msbuild.MsBuildBuilder>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\out\Release\AddIns
+ <command>pushd "%WORKSPACE%\out\Release\AddIns"
rd /S /Q GeoRest
popd</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\UserDoc
+ <command>pushd "%WORKSPACE%\UserDoc"
call make.bat html
popd
-pushd %WORKSPACE%\UserDoc\build\html
+pushd "%WORKSPACE%\UserDoc\build\html"
xcopy /S /Y *.* "%WORKSPACE%\out\Release\UserDoc\"
popd
</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\Thirdparty\NSIS
+ <command>pushd "%WORKSPACE%\Thirdparty\NSIS"
makensis.exe /DSLN_CONFIG=Release /DCPU=x86 /DRELEASE_VERSION=%VersionLabel% "%WORKSPACE%\Install\Maestro.nsi"
-pushd
-pushd %WORKSPACE%\out
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-move /Y *.exe %MG_BUILD_ARTIFACT_PATH%\maestro
+popd
+pushd "%WORKSPACE%\out"
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+move /Y *.exe "%MG_BUILD_ARTIFACT_PATH%\maestro"
popd</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\out\Release\AddIns
+ <command>pushd "%WORKSPACE%\out\Release\AddIns"
rd /S /Q Local
rd /S /Q Scripting
popd
-pushd %WORKSPACE%\out\Release
+pushd "%WORKSPACE%\out\Release"
del /Q LocalConfigure.*
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MapGuideMaestro-%VersionLabel%-Release.zip .
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+7z a -tzip -mx9 "%MG_BUILD_ARTIFACT_PATH%\maestro\MapGuideMaestro-%VersionLabel%-Release.zip" .
popd</command>
</hudson.tasks.BatchFile>
<hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
@@ -111,12 +111,12 @@
<continueOnBuildFailure>false</continueOnBuildFailure>
</hudson.plugins.msbuild.MsBuildBuilder>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\Doc\Help
+ <command>pushd "%WORKSPACE%\Doc\Help"
move /Y MaestroAPI.chm "%WORKSPACE%\SDK"
popd
-pushd %WORKSPACE%\SDK
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MaestroSDK_%VersionLabel%.zip .
+pushd "%WORKSPACE%\SDK"
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+7z a -tzip -mx9 "%MG_BUILD_ARTIFACT_PATH%\maestro\MaestroSDK_%VersionLabel%.zip" .
popd</command>
</hudson.tasks.BatchFile>
</builders>
Modified: trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml
===================================================================
--- trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml 2013-09-30 16:31:04 UTC (rev 7884)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/Maestro trunk/config.xml 2013-09-30 16:48:20 UTC (rev 7885)
@@ -52,13 +52,13 @@
<concurrentBuild>false</concurrentBuild>
<builders>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%
+ <command>pushd "%WORKSPACE%"
rd /S /Q out
popd
-pushd %WORKSPACE%\Properties
-%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:5.0.0.%SVN_REVISION% GlobalAssemblyInfo.cs
+pushd "%WORKSPACE%\Properties"
+%MG_TOOL_PATH%\SetAssemblyVersion.exe -set:5.1.0.%SVN_REVISION% GlobalAssemblyInfo.cs
popd
-pushd %WORKSPACE%\SDK
+pushd "%WORKSPACE%\SDK"
rd /S /Q bin
popd</command>
</hudson.tasks.BatchFile>
@@ -70,37 +70,37 @@
<continueOnBuildFailure>false</continueOnBuildFailure>
</hudson.plugins.msbuild.MsBuildBuilder>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\out\Release\AddIns
+ <command>pushd "%WORKSPACE%\out\Release\AddIns"
rd /S /Q GeoRest
popd</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\UserDoc
+ <command>pushd "%WORKSPACE%\UserDoc"
call make.bat html
popd
-pushd %WORKSPACE%\UserDoc\build\html
+pushd "%WORKSPACE%\UserDoc\build\html"
xcopy /S /Y *.* "%WORKSPACE%\out\Release\UserDoc\"
popd
</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\Thirdparty\NSIS
+ <command>pushd "%WORKSPACE%\Thirdparty\NSIS"
makensis.exe /DSLN_CONFIG=Release /DCPU=x86 /DRELEASE_VERSION=%VersionLabel% "%WORKSPACE%\Install\Maestro.nsi"
-pushd
-pushd %WORKSPACE%\out
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-move /Y *.exe %MG_BUILD_ARTIFACT_PATH%\maestro
+popd
+pushd "%WORKSPACE%\out"
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+move /Y *.exe "%MG_BUILD_ARTIFACT_PATH%\maestro"
popd</command>
</hudson.tasks.BatchFile>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\out\Release\AddIns
+ <command>pushd "%WORKSPACE%\out\Release\AddIns"
rd /S /Q Local
rd /S /Q Scripting
popd
-pushd %WORKSPACE%\out\Release
+pushd "%WORKSPACE%\out\Release"
del /Q LocalConfigure.*
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MapGuideMaestro-%VersionLabel%-Release.zip .
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+7z a -tzip -mx9 "%MG_BUILD_ARTIFACT_PATH%\maestro\MapGuideMaestro-%VersionLabel%-Release.zip" .
popd</command>
</hudson.tasks.BatchFile>
<hudson.plugins.msbuild.MsBuildBuilder plugin="msbuild at 1.17">
@@ -111,12 +111,12 @@
<continueOnBuildFailure>false</continueOnBuildFailure>
</hudson.plugins.msbuild.MsBuildBuilder>
<hudson.tasks.BatchFile>
- <command>pushd %WORKSPACE%\Doc\Help
+ <command>pushd "%WORKSPACE%\Doc\Help"
move /Y MaestroAPI.chm "%WORKSPACE%\SDK"
popd
-pushd %WORKSPACE%\SDK
-if not exist %MG_BUILD_ARTIFACT_PATH%\maestro mkdir %MG_BUILD_ARTIFACT_PATH%\maestro
-7z a -tzip -mx9 %MG_BUILD_ARTIFACT_PATH%\maestro\MaestroSDK_%VersionLabel%.zip .
+pushd "%WORKSPACE%\SDK"
+if not exist "%MG_BUILD_ARTIFACT_PATH%\maestro" mkdir "%MG_BUILD_ARTIFACT_PATH%\maestro"
+7z a -tzip -mx9 "%MG_BUILD_ARTIFACT_PATH%\maestro\MaestroSDK_%VersionLabel%.zip" .
popd</command>
</hudson.tasks.BatchFile>
</builders>
More information about the mapguide-commits
mailing list