Author: dreimer
Date: Thu Apr 15 00:03:45 2010
New Revision: 46874
URL: http://svn.reactos.org/svn/reactos?rev=46874&view=rev
Log:
Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming BuildBot
Vars to skip the updating of the main trunk source when ssvn is used to do so.
If its being set to "1" it only updates rosapps and rostests if existant. This
is needed for Olaf Siejka's Windows Buildbot project. As Default its set to "0"
and thus all behaves as before. UNTESTED
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1?rev=46874&r1=46873&r2=46874&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Apr
15 00:03:45 2010
@@ -45,6 +45,7 @@
$global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs"
$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
+$global:_BUILDBOT_SVNSKIPMAINTRUNK = "0"
if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") {
$global:_ROSBE_ORIGINALPATH =
"$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\"
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1?rev=46874&r1=46873&r2=46874&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Apr 15
00:03:45 2010
@@ -31,7 +31,9 @@
if ("$_ROSBE_SSVN_JOB" -eq "update") {
if ("$($arg[1])" -ne "") {
$temparg = $arg[1]
- IEX "& svn.exe update -r $temparg"
+ if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
+ IEX "& svn.exe update -r $temparg"
+ }
if (Test-Path "modules\rosapps\.") {
Set-Location modules\rosapps
"Updating RosApps..."
@@ -45,7 +47,9 @@
Set-Location "$_ROSBE_ROSSOURCEDIR"
}
} else {
- IEX "& svn.exe update"
+ if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
+ IEX "& svn.exe update"
+ }
if (Test-Path "modules\rosapps\.") {
Set-Location modules\rosapps
"Updating RosApps..."
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd?rev=46874&r1=46873&r2=46874&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Apr 15
00:03:45 2010
@@ -39,6 +39,7 @@
set _ROSBE_SHOWVERSION=0
set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386
set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%
+set _BUILDBOT_SVNSKIPMAINTRUNK=0
if "%_ROSBE_NOSYSPATH%" == "1" (
set
_ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd?rev=46874&r1=46873&r2=46874&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Apr 15
00:03:45 2010
@@ -142,7 +142,9 @@
)
if "!_ROSBE_SSVN_JOB!" == "update" (
if not "%2" == "" (
- svn.exe update -r %2
+ if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
+ svn.exe update -r %2
+ )
if exist "modules\rosapps\." (
cd modules\rosapps
echo Updating RosApps...
@@ -156,7 +158,9 @@
cd "%_ROSBE_ROSSOURCEDIR%"
)
) else (
- svn.exe update
+ if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
+ svn.exe update
+ )
if exist "modules\rosapps\." (
cd modules\rosapps
echo Updating RosApps...
