[ros-diffs] [dreimer] 45050: Ok, last time I delete my built main tree while playing with clean in a branch! Now clean cleans the branch you are in!

[dreimer at svn.reactos.org]

Author: dreimer
Date: Mon Jan 11 22:22:52 2010
New Revision: 45050

URL: http://svn.reactos.org/svn/reactos?rev=45050&view=rev
Log:
Ok, last time I delete my built main tree while playing with clean in a branch!
Now clean cleans the branch you are in!

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1?rev=45050&r1=45049&r2=45050&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Mon Jan 11 22:22:52 2010
@@ -25,21 +25,21 @@
     # 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 @@
         "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)
     }
 }
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd?rev=45050&r1=45049&r2=45050&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Mon Jan 11 22:22:52 2010
@@ -56,21 +56,21 @@
 
 :: 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 @@
     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