[ros-diffs] [dreimer] 39145: Synched recent changes into PS too.

Author: dreimer
Date: Tue Jan 27 12:28:59 2009
New Revision: 39145

URL: http://svn.reactos.org/svn/reactos?rev=39145&view=rev
Log:
Synched recent changes into PS too.

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

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Jan 27 12:28:59
2009
@@ -31,34 +31,26 @@
     # Apply modified obj and out paths for deletion.
     #
 
+    if ($ENV:ROS_ARCH -eq $null) {
+        $ENV:ROS_ARCH = "i386"
+    }
+
     if ($_ROSBE_OBJPATH -eq $null) {
-        if ($ENV:ROS_ARCH -ne $null) {
-            $_ROSBE_OBJCLEANPATH = "obj-$ENV:ROS_ARCH"
-        } else {
-            $_ROSBE_OBJCLEANPATH = "obj-i386"
-        }
+        $_ROSBE_OBJCLEANPATH = "$_ROSBE_ROSSOURCEDIR\obj-$ENV:ROS_ARCH"
     } else {
         $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH"
     }
 
     if ($_ROSBE_OUTPATH -eq $null) {
-        if ($ENV:ROS_ARCH -ne $null) {
-            $_ROSBE_OUTCLEANPATH = "output-$ENV:ROS_ARCH"
-        } else {
-            $_ROSBE_OUTCLEANPATH = "output-i386"
-        }
+        $_ROSBE_OUTCLEANPATH = "$_ROSBE_ROSSOURCEDIR\output-$ENV:ROS_ARCH"
     } else {
         $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH"
     }
 
-    if ($ENV:ROS_ARCH -ne $null) {
-        $_ROSBE_MAKEFILE = "makefile-$ENV:ROS_ARCH.auto"
+    if ($ENV:ROS_ARCH -eq "i386") {
+        $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto"
     } else {
-        $_ROSBE_MAKEFILE = "makefile.auto"
-    }
-
-    if ($ENV:ROS_ARCH -eq $null) {
-        $ENV:ROS_ARCH = "i386"
+        $_ROSBE_MAKEFILE = "$_ROSBE_ROSSOURCEDIR\makefile.auto"
     }
 
     if (Test-Path "$_ROSBE_MAKEFILE") {
@@ -82,8 +74,8 @@
         $ENV:ROS_ARCH = $null
     }
 
-    if (Test-Path "reactos") {
-        $null = (Remove-Item "reactos" -recurse -force)
+    if (Test-Path "$_ROSBE_ROSSOURCEDIR\reactos") {
+        $null = (Remove-Item "$_ROSBE_ROSSOURCEDIR\reactos" -recurse -force)
     }
 }