Author: dreimer
Date: Fri Sep 18 11:27:27 2009
New Revision: 43071
URL:
http://svn.reactos.org/svn/reactos?rev=43071&view=rev
Log:
Add AMD64 Branch SVN Tree Creation Support to ssvn.
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
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/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Fri Sep 18 11:27:27
2009
@@ -11,7 +11,11 @@
$OFFSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info" |
select-string "Revision:"
$OFFSVN = $OFFSVN -replace "(.*)Revision: ",''
$OFFSVN = [CONVERT]::ToInt32($OFFSVN,10)
- $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info
svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:"
+ if ("$ENV:ROS_ARCH" -eq "amd64") {
+ $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos" | select-string
"Revision:"
+ } else {
+ $ONSVN = IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' info
svn://svn.reactos.org/reactos/trunk/reactos" | select-string "Revision:"
+ }
$ONSVN = $ONSVN -replace "(.*)Revision: ",''
$ONSVN = [CONVERT]::ToInt32($ONSVN,10)
"Local Revision: $OFFSVN"
@@ -98,7 +102,11 @@
$null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force)
$dir = get-childitem
if ("$dir" -eq "") {
- IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/reactos ."
+ if ("$ENV:ROS_ARCH" -eq "amd64") {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos ."
+ } else {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/reactos ."
+ }
} else {
"ERROR: Folder is not empty. Continuing is dangerous and can cause
errors. ABORTED"
}
@@ -117,7 +125,11 @@
Set-Location modules\rosapps
$dir = get-childitem
if ("$dir" -eq "") {
- IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/rosapps ."
+ if ("$ENV:ROS_ARCH" -eq "amd64") {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps ."
+ } else {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/rosapps ."
+ }
} else {
"ERROR: Folder is not empty. Continuing is dangerous and can cause
errors. ABORTED"
}
@@ -137,7 +149,11 @@
Set-Location modules\rostests
$dir = get-childitem
if ("$dir" -eq "") {
- IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/rostests ."
+ if ("$ENV:ROS_ARCH" -eq "amd64") {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests ."
+ } else {
+ IEX "&'$_ROSBE_BASEDIR\Tools\svn.exe' checkout
svn://svn.reactos.org/reactos/trunk/rostests ."
+ }
} else {
"ERROR: Folder is not empty. Continuing is dangerous and can cause
errors. ABORTED"
}
Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Fri Sep 18 11:27:27 2009
@@ -47,7 +47,11 @@
rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
- "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/reactos .
+ if "%ROS_ARCH%" == "amd64" (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos .
+ ) else (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/reactos .
+ )
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
)
@@ -67,7 +71,11 @@
cd modules\rosapps
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
- "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rosapps .
+ if "%ROS_ARCH%" == "amd64" (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rosapps .
+ ) else (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rosapps .
+ )
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
)
@@ -88,7 +96,11 @@
cd modules\rostests
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
- "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rostests .
+ if "%ROS_ARCH%" == "amd64" (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/rostests .
+ ) else (
+ "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout
svn://svn.reactos.org/reactos/trunk/rostests .
+ )
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
)
@@ -112,7 +124,11 @@
:UP
for /f "usebackq tokens=2" %%i in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info | find
"Revision:""`) do set OFFSVN=%%i
- for /f "usebackq tokens=2" %%j in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info
svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set
ONSVN=%%j
+ if "%ROS_ARCH%" == "amd64" (
+ for /f "usebackq tokens=2" %%j in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info
svn://svn.reactos.org/reactos/branches/ros-amd64-bringup/reactos | find
"Revision:""`) do set ONSVN=%%j
+ ) else (
+ for /f "usebackq tokens=2" %%j in
(`""%_ROSBE_BASEDIR%\Tools\svn.exe" info
svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set
ONSVN=%%j
+ )
echo Local Revision: !OFFSVN!
echo Online HEAD Revision: !ONSVN!