[ros-diffs] [dreimer] 38758: Sync PS Port.

Author: dreimer
Date: Wed Jan 14 07:21:18 2009
New Revision: 38758

URL: http://svn.reactos.org/svn/reactos?rev=38758&view=rev
Log:
Sync PS Port.

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

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Jan 14 07:21:18
2009
@@ -74,20 +74,16 @@
 #
 if ($_ROSBE_OBJPATH -ne $null) {
     if (Test-Path "$_ROSBE_OBJPATH") {
-        "ERROR: The Object-Path specified doesn't seem to exist."
-        exit
-    } else {
-        $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH"
-    }
+        "WARNING: The Object-Path specified doesn't seem to exist.
Creating..."
+    } 
+    $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH"
 }
 if ($_ROSBE_OUTPATH -ne $null) {
     if (Test-Path "$_ROSBE_OUTPATH") {
-        "ERROR: The Output-Path specified doesn't seem to exist."
-        exit
-    } else {
-        $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH"
-        $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH"
-    }
+        "WARNING: The Output-Path specified doesn't seem to exist.
Creating..."
+    }
+    $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH"
+    $ENV:ROS_TEMPORARY = "$_ROSBE_OUTPATH"
 }
 
 #

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 14 07:21:18
2009
@@ -27,45 +27,52 @@
     # Check if we have something to clean, if so, clean it.
     #
 
-    if ($ENV:ROS_ARCH -ne $null) {
-        if (Test-Path ".\obj-$ENV:ROS_ARCH") {
-            "Cleaning ReactOS $ENV:ROS_ARCH source directory..."
-            #
-            # Remove directories/makefile.auto created by the build.
-            #
-            if (Test-Path ".\obj-$ENV:ROS_ARCH") {
-                $null = (Remove-Item ".\obj-$ENV:ROS_ARCH" -recurse -force)
-            }
-            if (Test-Path ".\output-$ENV:ROS_ARCH") {
-                $null = (Remove-Item ".\output-$ENV:ROS_ARCH" -recurse -force)
-            }
-            if (Test-Path ".\makefile-$ENV:ROS_ARCH.auto") {
-                $null = (Remove-Item ".\makefile-$ENV:ROS_ARCH.auto" -force)
-            }
-            "Done cleaning ReactOS $ENV:ROS_ARCH source directory."
+    #
+    # Apply modified obj and out paths for deletion.
+    #
+
+    if ($_ROSBE_OBJPATH -eq $null) {
+        if ($ENV:ROS_ARCH -ne $null) {
+            $_ROSBE_OBJCLEANPATH = "obj-$ENV:ROS_ARCH"
         } else {
-            "ERROR: There is no $ENV:ROS_ARCH compiler output to clean."
+            $_ROSBE_OBJCLEANPATH = "obj-i386"
         }
     } else {
-        if (Test-Path ".\obj-i386") {
-            "Cleaning ReactOS i386 source directory..."
-            #
-            # Remove directories/makefile.auto created by the build.
-            #
-            if (Test-Path ".\obj-i386") {
-                $null = (Remove-Item ".\obj-i386" -recurse -force)
-            }
-            if (Test-Path ".\output-i386") {
-                $null = (Remove-Item ".\output-i386" -recurse -force)
-            }
-            if (Test-Path ".\makefile.auto") {
-                $null = (Remove-Item ".\makefile.auto" -force)
-            }
-            "Done cleaning ReactOS i386 source directory."
+        $_ROSBE_OBJCLEANPATH = "$_ROSBE_OBJPATH"
+    }
+
+    if ($_ROSBE_OUTPATH -eq $null) {
+        if ($ENV:ROS_ARCH -ne $null) {
+            $_ROSBE_OUTCLEANPATH = "output-$ENV:ROS_ARCH"
         } else {
-            "ERROR: There is no i386 compiler output to clean."
+            $_ROSBE_OUTCLEANPATH = "output-i386"
         }
+    } else {
+        $_ROSBE_OUTCLEANPATH = "$_ROSBE_OUTPATH"
     }
+
+    if ($ENV:ROS_ARCH -ne $null) {
+        $_ROSBE_MAKEFILE = "makefile-$ENV:ROS_ARCH.auto"
+    } else {
+        $_ROSBE_MAKEFILE = "makefile.auto"
+    }
+
+    if (Test-Path "$_ROSBE_OBJCLEANPATH\.") {
+        "Cleaning ReactOS $ENV:ROS_ARCH source directory..."
+        if (Test-Path "$_ROSBE_OBJCLEANPATH\.") {
+            $null = (Remove-Item "$_ROSBE_OBJCLEANPATH" -recurse -force)
+        }
+        if (Test-Path "$_ROSBE_OUTCLEANPATH\.") {
+            $null = (Remove-Item "$_ROSBE_OUTCLEANPATH" -recurse -force)
+        }
+        if (Test-Path "$_ROSBE_MAKEFILE") {
+            $null = (Remove-Item "$_ROSBE_MAKEFILE" -force)
+        }
+        "Done cleaning ReactOS $ENV:ROS_ARCH source directory."
+    } else {
+        "ERROR: There is no $ENV:ROS_ARCH compiler output to clean."
+    }
+
     if (Test-Path "reactos") {
         $null = (Remove-Item "reactos" -recurse -force)
     }
@@ -73,6 +80,14 @@
 
 function end {
     $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
+
+    #
+    # Unload all used Vars.
+    #
+    $_ROSBE_OBJCLEANPATH = $null
+    $_ROSBE_OUTCLEANPATH = $null
+    $_ROSBE_MAKEFILE = $null
+
     exit
 }
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Jan 14 07:21:18 2009
@@ -91,7 +91,6 @@
     )
     set ROS_OUTPUT=%_ROSBE_OUTPATH%
     set ROS_TEMPORARY=%_ROSBE_OUTPATH%
-    )
 )
 
 ::