Ok, last time I delete my built main tree while playing with clean in a branch!

Now clean cleans the branch you are in!

svn path=/trunk/tools/RosBE/; revision=1155
This commit is contained in:
Daniel Reimer 2010-01-11 21:22:52 +00:00
parent 871db0a27e
commit 9c3378f957
2 changed files with 12 additions and 12 deletions

View File

@ -25,21 +25,21 @@ function rembin {
# Apply modified obj and out paths for deletion.
if ("$_ROSBE_OBJPATH" -eq "") {
$OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH"
$OBJCLEANPATH = "obj-$ENV:ROS_ARCH"
} else {
$OBJCLEANPATH = "$_ROSBE_OBJPATH"
}
if ("$_ROSBE_OUTPATH" -eq "") {
$OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH"
$OUTCLEANPATH = "output-$ENV:ROS_ARCH"
} else {
$OUTCLEANPATH = "$_ROSBE_OUTPATH"
}
if ("$ENV:ROS_ARCH" -eq "i386") {
$MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto"
$MAKEFILE = "makefile.auto"
} else {
$MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto"
$MAKEFILE = "makefile-$ENV:ROS_ARCH.auto"
}
if (Test-Path "$MAKEFILE") {
@ -59,8 +59,8 @@ function rembin {
"ERROR: There is no $ENV:ROS_ARCH compiler output to clean."
}
if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") {
$null = (Remove-Item "$_ROSBE_ROSSOURCEDIR\reactos" -recurse -force)
if (Test-Path "reactos") {
$null = (Remove-Item "reactos" -recurse -force)
}
}

View File

@ -56,21 +56,21 @@ goto :EOF
:: Apply modified obj and out paths for deletion.
if "%_ROSBE_OBJPATH%" == "" (
set OBJCLEANPATH=%_ROSBE_ROSSOURCEDIR%\obj-%ROS_ARCH%
set OBJCLEANPATH=obj-%ROS_ARCH%
) else (
set OBJCLEANPATH=%_ROSBE_OBJPATH%
)
if "%_ROSBE_OUTPATH%" == "" (
set OUTCLEANPATH=%_ROSBE_ROSSOURCEDIR%\output-%ROS_ARCH%
set OUTCLEANPATH=output-%ROS_ARCH%
) else (
set OUTCLEANPATH=%_ROSBE_OUTPATH%
)
if /i "%ROS_ARCH%" == "i386" (
set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile.auto
set MAKEFILE=makefile.auto
) else (
set MAKEFILE=%_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto
set MAKEFILE=makefile-%ROS_ARCH%.auto
)
if exist "%MAKEFILE%" (
@ -93,8 +93,8 @@ if exist "%OBJCLEANPATH%\." (
echo ERROR: There is no %ROS_ARCH% compiler output to clean.
)
if exist "%_ROSBE_ROSSOURCEDIR%\reactos\." (
rd /s /q "%_ROSBE_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
if exist "reactos\." (
rd /s /q "reactos" 1> NUL 2> NUL
)
goto :EOF