[ros-diffs] [dreimer] 47115: - Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. - Update changelog.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Thu May 6 17:29:01 CEST 2010
Author: dreimer
Date: Thu May 6 17:28:59 2010
New Revision: 47115
URL: http://svn.reactos.org/svn/reactos?rev=47115&view=rev
Log:
- Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable.
- Update changelog.
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
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=47115&r1=47114&r2=47115&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 May 6 17:28:59 2010
@@ -5,6 +5,8 @@
# PURPOSE: Integrated SVN Client.
# COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel at freenet.de>
#
+
+$_ROSBE_SSVNSOURCEDIR = "$pwd"
function UP($arg) {
$OFFSVN = IEX "& svn.exe info" | select-string "Revision:"
@@ -34,33 +36,33 @@
if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
IEX "& svn.exe update -r $temparg"
}
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") {
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ if (Test-Path "modules\rosapps\.") {
+ Set-Location "modules\rosapps"
"Updating RosApps..."
IEX "& svn.exe update -r $temparg"
- Set-Location "$_ROSBE_ROSSOURCEDIR"
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") {
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
+ }
+ if (Test-Path "modules\rostests\.") {
+ Set-Location "modules\rostests"
"Updating RosTests..."
IEX "& svn.exe update -r $temparg"
- Set-Location "$_ROSBE_ROSSOURCEDIR"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
} else {
if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
IEX "& svn.exe update"
}
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.") {
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ if (Test-Path "modules\rosapps\.") {
+ Set-Location "modules\rosapps"
"Updating RosApps..."
IEX "& svn.exe update"
- Set-Location "$_ROSBE_ROSSOURCEDIR"
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.") {
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
+ }
+ if (Test-Path "modules\rostests\.") {
+ Set-Location "modules\rostests"
"Updating RosTests..."
IEX "& svn.exe update"
- Set-Location "$_ROSBE_ROSSOURCEDIR"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
}
"Do you want to see the changelog?"
@@ -127,16 +129,16 @@
# Check if the folder is empty. If not, output an error.
elseif ("$($args[0])" -eq "rosapps") {
if ("$($args[1])" -ne "") {
- if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) {
- new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") {
+ if (!(Test-Path "modules\rosapps\.")) {
+ new-item -path "modules" -name rosapps -type directory
+ }
+ if (Test-Path "modules\rosapps\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosApps Updating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ Set-Location "modules\rosapps"
IEX "& svn.exe update -r $($args[1])"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosApps Creating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ Set-Location "modules\rosapps"
$dir = get-childitem
if ("$dir" -eq "") {
if("$ENV:ROS_ARCH" -eq "amd64") {
@@ -149,16 +151,16 @@
}
}
} else {
- if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.")) {
- new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rosapps -type directory
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rosapps\.svn\.") {
+ if (!(Test-Path "modules\rosapps\.")) {
+ new-item -path "modules" -name rosapps -type directory
+ }
+ if (Test-Path "modules\rosapps\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosApps Updating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ Set-Location "modules\rosapps"
IEX "& svn.exe update"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosApps Creating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rosapps"
+ Set-Location "modules\rosapps"
$dir = get-childitem
if ("$dir" -eq "") {
if ("$ENV:ROS_ARCH" -eq "amd64") {
@@ -171,22 +173,22 @@
}
}
}
- Set-Location "$_ROSBE_ROSSOURCEDIR"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
# Check if the folder is empty. If not, output an error.
elseif ("$($args[0])" -eq "rostests") {
if ("$($args[1])" -ne "") {
- if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) {
- new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") {
+ if (!(Test-Path "modules\rostests\.")) {
+ new-item -path "modules" -name rostests -type directory
+ }
+ if (Test-Path "modules\rostests\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosTests Updating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "modules\rostests"
IEX "& svn.exe update -r $($args[1])"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosTests Creating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "modules\rostests"
$dir = get-childitem
if ("$dir" -eq "") {
if("$ENV:ROS_ARCH" -eq "amd64") {
@@ -199,16 +201,16 @@
}
}
} else {
- if (!(Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.")) {
- new-item -path "$_ROSBE_ROSSOURCEDIR\modules" -name rostests -type directory
- }
- if (Test-Path "$_ROSBE_ROSSOURCEDIR\modules\rostests\.svn\.") {
+ if (!(Test-Path "modules\rostests\.")) {
+ new-item -path "modules" -name rostests -type directory
+ }
+ if (Test-Path "modules\rostests\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosTests Updating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "modules\rostests"
IEX "& svn.exe update"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosTests Creating..."
- Set-Location "$_ROSBE_ROSSOURCEDIR\modules\rostests"
+ Set-Location "modules\rostests"
$dir = get-childitem
if ("$dir" -eq "") {
if ("$ENV:ROS_ARCH" -eq "amd64") {
@@ -221,7 +223,7 @@
}
}
}
- Set-Location "$_ROSBE_ROSSOURCEDIR"
+ Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
# Output the revision of the local and online trees and tell the user if
Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt?rev=47115&r1=47114&r2=47115&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu May 6 17:28:59 2010
@@ -4,8 +4,22 @@
To activate it, make a system Variable named "_ROSBE_NOSYSPATH" and set it to 1. (Daniel Reimer)
- sSVN: Make use of the http:// protocol instead of the svn:// one. (Daniel Reimer)
- Add remakex command to RosBE. (Daniel Reimer)
-- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now. (Daniel Reimer)
+- Add sound output on finished build. On PS we have one for a successful and one for a failed build. On CMD we have just one for now, if you let it
+ generate a LOG File. (Daniel Reimer)
- Made a small modification to be able to ask for help for ps commands in RosBE, too. (Daniel Reimer)
+- 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. (Daniel Reimer)
+- Fix a access error when you start two builds in the same minute on a PC by adding the seconds to $TIMENAME, too. (Daniel Reimer)
+- Clean up $DATENAME which included the year twice. (Daniel Reimer)
+- Weaken the ROS Source Dir check in clean a bit so that it does remove the built stuff even if it did not even build any tool yet. (Daniel Reimer)
+- Add the correct license to the audio files. (Daniel Reimer)
+- If a custom output folder is defined, pass it to log2lines, too. (Mephisto, Daniel Reimer)
+- Feature request by Olaf Siejka. The sSVN parameters "rosapps" and "rostests" were originally made for just creating rosapps / rostests repositories
+ in the modules folder. Now it detects an existant repository and just updates that one. If theres no repository or even no folder for the repository
+ it first generates it and continues. Additionally you can set the revision you wanna checkout or update to. "create" accepts a revision as second
+ parameter now, too. (Daniel Reimer)
+- Make sSVN fully multi Source Tree compatible by removing the dependency on the _ROSBE_ROSSOURCEDIR variable. (Daniel Reimer)
*** Feb 08th, 2010 - RosBE 1.5 Released
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=47115&r1=47114&r2=47115&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 May 6 17:28:59 2010
@@ -14,6 +14,8 @@
setlocal enabledelayedexpansion
+set _ROSBE_SSVNSOURCEDIR=%CD%
+
:: Receive the first parameter and decide what to do.
if "%1" == "" (
echo No parameter specified. Try 'help [COMMAND]'.
@@ -69,16 +71,16 @@
:: Check if the folder is empty. If not, output an error.
if /i "%1" == "rosapps" (
if not "%2" == "" (
- if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." (
- md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." (
+ if not exist "modules\rosapps\." (
+ md "modules\rosapps"
+ )
+ if exist "modules\rosapps\.svn\." (
title SVN RosApps Updating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ cd "modules\rosapps"
svn.exe update -r %2
) else (
title SVN RosApps Creating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ cd "modules\rosapps"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
if "%ROS_ARCH%" == "amd64" (
@@ -91,16 +93,16 @@
)
)
) else (
- if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." (
- md "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\.svn\." (
+ if not exist "modules\rosapps\." (
+ md "modules\rosapps"
+ )
+ if exist "modules\rosapps\.svn\." (
title SVN RosApps Updating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ cd "modules\rosapps"
svn.exe update
) else (
title SVN RosApps Creating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ cd "modules\rosapps"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
if "%ROS_ARCH%" == "amd64" (
@@ -113,23 +115,23 @@
)
)
)
- cd "%_ROSBE_ROSSOURCEDIR%"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
goto :EOC
)
:: Check if the folder is empty. If not, output an error.
if /i "%1" == "rostests" (
if not "%2" == "" (
- if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." (
- md "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." (
+ if not exist "modules\rostests\." (
+ md "modules\rostests"
+ )
+ if exist "modules\rostests\.svn\." (
title SVN RosTests Updating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "modules\rostests"
svn.exe update -r %2
) else (
title SVN RosTests Creating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "modules\rostests"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
if "%ROS_ARCH%" == "amd64" (
@@ -142,16 +144,16 @@
)
)
) else (
- if not exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." (
- md "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\.svn\." (
+ if not exist "modules\rostests\." (
+ md "modules\rostests"
+ )
+ if exist "modules\rostests\.svn\." (
title SVN RosTests Updating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "modules\rostests"
svn.exe update
) else (
title SVN RosTests Creating...
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "modules\rostests"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
if "%ROS_ARCH%" == "amd64" (
@@ -164,7 +166,7 @@
)
)
)
- cd "%_ROSBE_ROSSOURCEDIR%"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
goto :EOC
)
@@ -205,33 +207,33 @@
if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
svn.exe update -r %2
)
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." (
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ if exist "modules\rosapps\." (
+ cd "modules\rosapps"
echo Updating RosApps...
svn.exe update -r %2
- cd "%_ROSBE_ROSSOURCEDIR%"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." (
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
+ )
+ if exist "modules\rostests\." (
+ cd "modules\rostests"
echo Updating RosTests...
svn.exe update -r %2
- cd "%_ROSBE_ROSSOURCEDIR%"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
)
) else (
if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
svn.exe update
)
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rosapps\." (
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rosapps"
+ if exist "modules\rosapps\." (
+ cd "modules\rosapps"
echo Updating RosApps...
svn.exe update
- cd "%_ROSBE_ROSSOURCEDIR%"
- )
- if exist "%_ROSBE_ROSSOURCEDIR%\modules\rostests\." (
- cd "%_ROSBE_ROSSOURCEDIR%\modules\rostests"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
+ )
+ if exist "modules\rostests\." (
+ cd "modules\rostests"
echo Updating RosTests...
svn.exe update
- cd "%_ROSBE_ROSSOURCEDIR%"
+ cd "%_ROSBE_SSVNSOURCEDIR%"
)
)
)
More information about the Ros-diffs
mailing list