[mapguide-commits] r7558 - in trunk/Tools/JenkinsCI/home/slave_win/jobs: MapGuide Open Source x64 MapGuide Open Source x86

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-06-04 06:15:37 -0700 (Tue, 04 Jun 2013)
New Revision: 7558

Modified:
   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:
#2210: Re-order the SVN revision recording step to avoid potential file locking issues on the SVN working copy.

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	2013-06-04 10:26:33 UTC (rev 7557)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x64/config.xml	2013-06-04 13:15:37 UTC (rev 7558)
@@ -104,6 +104,13 @@
 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
+
 if "%CLEAR_WORKING_AREA%"=="false" (
     echo [prepare]: Skip cleaning build area
     goto build_mapguide
@@ -165,12 +172,6 @@
 echo Updated - %MG_BUILD_AREA64%\Installer\build64.bat
 
 :build_mapguide
-cd %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%
-
 cd %MG_BUILD_AREA64%\MgDev
 echo [build]: Stamp version numbers
 SET BUILD_ACTION=Stamp version numbers

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	2013-06-04 10:26:33 UTC (rev 7557)
+++ trunk/Tools/JenkinsCI/home/slave_win/jobs/MapGuide Open Source x86/config.xml	2013-06-04 13:15:37 UTC (rev 7558)
@@ -104,6 +104,13 @@
 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
+
 if "%CLEAR_WORKING_AREA%"=="false" (
     echo [prepare]: Skip cleaning build area
     goto build_mapguide
@@ -165,12 +172,6 @@
 REM echo Updated - %MG_BUILD_AREA%\Installer\build64.bat
 
 :build_mapguide
-cd %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%
-
 cd %MG_BUILD_AREA%\MgDev
 echo [build]: Stamp version numbers
 SET BUILD_ACTION=Stamp version numbers