subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1505417 - in /subversion/trunk/tools/buildbot/slaves/win32-SharpSvn: svn-config.cmd.template svntest-bindings.cmd svntest-build-bindings.cmd
Date Sun, 21 Jul 2013 16:48:01 GMT
Author: rhuijben
Date: Sun Jul 21 16:48:00 2013
New Revision: 1505417

URL: http://svn.apache.org/r1505417
Log:
Windows buildbot configuration: Start building swig-ruby on trunk

Modified:
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd

Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template?rev=1505417&r1=1505416&r2=1505417&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template Sun Jul
21 16:48:00 2013
@@ -29,3 +29,22 @@ SET TMP=%TEMP%
 
 IF NOT EXIST "%TESTDIR%\" MKDIR "%TESTDIR%"
 IF NOT EXIST "%TEMP%\" MKDIR "%TEMP%"
+
+
+
+
+
+SET SVN_URL=
+SET SVN_RELURL=
+for /F "usebackq tokens=1,* delims=:" %%i IN (`svn info build`) do (
+
+  IF "%%i" == "URL" (
+    SET SVN_URL=%%j
+  ) ELSE IF "%%i" == "Relative URL" (
+    SET SVN_RELURL=%%j
+  )
+)
+SET SVN_URL=%SVN_URL:~1%
+SET SVN_RELURL=%SVN_RELURL:~3%
+SET SVN_SUBBRANCH=%SVN_RELURL:~11%
+SET SVN_BRANCH=%SVN_SUBBRANCH:branches/=%

Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1505417&r1=1505416&r2=1505417&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Sun Jul 21
16:48:00 2013
@@ -23,9 +23,8 @@ SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDE
 CALL ..\svn-config.cmd
 IF ERRORLEVEL 1 EXIT /B 1
 
-svnversion . /1.6.x | find "S" > nul:
-IF ERRORLEVEL 1 (
-  ECHO --- Building 1.6.x: Skipping bindings ---
+IF "%SVN_BRANCH% LEQ "1.6.x" (
+  ECHO --- Building 1.6.x or older: Skipping bindings ---
   EXIT /B 0
 )
 
@@ -67,9 +66,8 @@ for %%i in (*.dll) do (
 )
 popd
 
-svnversion . /1.7.x | find "S" > nul:
-IF ERRORLEVEL 1 (
-  ECHO --- Building 1.7.x: Skipping perl tests ---
+IF "%SVN_BRANCH% LSS "1.8." (
+  ECHO --- Building 1.7.x: Skipping perl and ruby tests ---
   EXIT /B %result%
 )
 
@@ -82,4 +80,12 @@ IF ERRORLEVEL 1 (
 )
 popd
 
+IF "%SVN_BRANCH% LSS "1.9." (
+  ECHO --- Building 1.8.x: Skipping ruby tests ---
+  EXIT /B %result%
+)
+
+echo Not running ruby tests yet
+
+
 exit /b %result%

Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd?rev=1505417&r1=1505416&r2=1505417&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd Sun Jul
21 16:48:00 2013
@@ -23,8 +23,7 @@ SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDE
 CALL ..\svn-config.cmd
 IF ERRORLEVEL 1 EXIT /B 1
 
-svnversion . /1.6.x | find "S" > nul:
-IF ERRORLEVEL 1 (
+IF "%SVN_BRANCH% LEQ "1.6.x" (
   ECHO --- Building 1.6.x: Skipping bindings ---
   EXIT /B 0
 )
@@ -32,5 +31,9 @@ IF ERRORLEVEL 1 (
 msbuild subversion_vcnet.sln /p:Configuration=Debug /p:Platform=win32 /t:__JAVAHL__ /t:__JAVAHL_TESTS__
 IF ERRORLEVEL 1 EXIT /B 1
 
-msbuild subversion_vcnet.sln /p:Configuration=Release /p:Platform=win32 /t:__SWIG_PYTHON__
/t:__SWIG_PERL__
+IF "%SVN_BRANCH%" GTR "1.9." (
+  msbuild subversion_vcnet.sln /p:Configuration=Release /p:Platform=win32 /t:__SWIG_PYTHON__
/t:__SWIG_PERL__ /t:__SWIG_RUBY__
+) ELSE (
+  msbuild subversion_vcnet.sln /p:Configuration=Release /p:Platform=win32 /t:__SWIG_PYTHON__
/t:__SWIG_PERL__
+)
 IF ERRORLEVEL 1 EXIT /B 1



Mime
View raw message