[ros-diffs] [dreimer] 45289: Not that nice, but it works well ; -) Thx to Colin for noticing that I accidentally write some vars globally which should not be...

Author: dreimer
Date: Wed Jan 27 23:25:06 2010
New Revision: 45289

URL: http://svn.reactos.org/svn/reactos?rev=45289&view=rev
Log:
Not that nice, but it works well ;-) Thx to Colin for noticing that I accidentally write
some vars globally which should not be...

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] Wed Jan 27 23:25:06
2010
@@ -25,25 +25,33 @@
     # Check if the user set any custom filenames or pathes, otherwise locally set the
appropriate variables.
 
     if ("$ENV:ROS_AUTOMAKE" -eq "") {
-        $ENV:ROS_AUTOMAKE = "makefile-$ENV:ROS_ARCH.auto"
+        $ROS_AUTOMAKE = "makefile-$ENV:ROS_ARCH.auto"
+    } else {
+        $ROS_AUTOMAKE = $ENV:ROS_AUTOMAKE
     }
     if ("$ENV:ROS_INTERMEDIATE" -eq "") {
-        $ENV:ROS_INTERMEDIATE = "obj-$ENV:ROS_ARCH"
+        $ROS_INTERMEDIATE = "obj-$ENV:ROS_ARCH"
+    } else {
+        $ROS_INTERMEDIATE = $ENV:ROS_INTERMEDIATE
     }
     if ("$ENV:ROS_OUTPUT" -eq "") {
-        $ENV:ROS_OUTPUT = "output-$ENV:ROS_ARCH"
+        $ROS_OUTPUT = "output-$ENV:ROS_ARCH"
+    } else {
+        $ROS_OUTPUT = $ENV:ROS_OUTPUT
     }
     if ("$ENV:ROS_CDOUTPUT" -eq "") {
-        $ENV:ROS_CDOUTPUT = "reactos"
+        $ROS_CDOUTPUT = "reactos"
+    } else {
+        $ROS_CDOUTPUT = $ENV:ROS_CDOUTPUT
     }
 
-    if ((Test-Path "$ENV:ROS_INTERMEDIATE\.") -and (Test-Path
"$ENV:ROS_OUTPUT\.")) {
+    if ((Test-Path "$ROS_INTERMEDIATE\.") -and (Test-Path
"$ROS_OUTPUT\.")) {
         "Cleaning ReactOS $ENV:ROS_ARCH source directory..."
 
-            $null = (Remove-Item "$ENV:ROS_AUTOMAKE" -force)
-            $null = (Remove-Item "$ENV:ROS_INTERMEDIATE" -recurse -force)
-            $null = (Remove-Item "$ENV:ROS_OUTPUT" -recurse -force)
-            $null = (Remove-Item "$ENV:ROS_CDOUTPUT" -recurse -force)
+            $null = (Remove-Item "$ROS_AUTOMAKE" -force)
+            $null = (Remove-Item "$ROS_INTERMEDIATE" -recurse -force)
+            $null = (Remove-Item "$ROS_OUTPUT" -recurse -force)
+            $null = (Remove-Item "$ROS_CDOUTPUT" -recurse -force)
 
         "Done cleaning ReactOS $ENV:ROS_ARCH source directory."
     } else {