[ros-diffs] [dreimer] 36976: Almost done. Only two Variables are still making problems.

Author: dreimer
Date: Sat Oct 25 19:08:28 2008
New Revision: 36976

URL: http://svn.reactos.org/svn/reactos?rev=36976&view=rev
Log:
Almost done. Only two Variables are still making problems.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1

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] Sat Oct 25 19:08:28
2008
@@ -42,7 +42,7 @@
 # Small Security Check to prevent useless apps.
 if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") {
     if ($ENV:ROS_BUILDNOSTRIP -eq "yes") {
-!        cls
+        cls
         "Selecting Stripping and removing Debug Symbols together will most likely
cause useless apps. Please deselect one of them."
         exit
     }
@@ -68,7 +68,7 @@
             $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc"
             $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++"
         }
-        if $ENV:ROS_ARCH -eq "ppc") {
+        if ($ENV:ROS_ARCH -eq "ppc") {
             $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc"
             $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++"
         }
@@ -90,7 +90,7 @@
             $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc"
             $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++"
         }
-        if $ENV:ROS_ARCH -eq "ppc") {
+        if ($ENV:ROS_ARCH -eq "ppc") {
             $ENV:TARGET_CC = "ppc-pc-mingw32-gcc"
             $ENV:TARGET_CPP = "ppc-pc-mingw32-g++"
         }

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sat Oct 25 19:08:28
2008
@@ -68,7 +68,7 @@
     }
 
     if (Test-Path "$_ROSBE_BASEDIR\update.ps1") {
-        "    update [OPTIONS]     - Updates RosBE to the most recent files.
+        "    update [OPTIONS]     - Updates RosBE to the most recent files."
     }
 
     ""

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat Oct 25 19:08:28
2008
@@ -131,8 +131,20 @@
     if ($args -eq "oldmode") {
         cls
         $_ROSBE_MODE = "MinGW"
-
-    } else {
+    }
+    elseif ($args -eq "arm") {
+        cls
+        $_ROSBE_ARCH = 1
+    }
+    elseif ($args -eq "ppc") {
+        cls
+        $_ROSBE_ARCH = 2
+    }
+    elseif ($args -eq "amd64") {
+        cls
+        $_ROSBE_ARCH = 3
+    }
+    elseif ($args -ne $null) {
         cls
         "Unknown parameter specified. Exiting."
         exit

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat Oct 25
19:08:28 2008
@@ -11,10 +11,10 @@
 # Check if we are running within the RosBE, and if not initialize GCC for the
 # current directory.
 #
-if ($ENV:_ROSBE_MINGWPATH -eq $null) {
-    $ENV:_ROSBE_MODE = "MinGW"
-    $ENV:_ROSBE_MINGWPATH = "$pwd"
-    $ENV:_ROSBE_ORIGINALPATH = "$PATH"
+if ($_ROSBE_HOST_MINGWPATH -eq $null) {
+    $_ROSBE_MODE = "MinGW"
+    $_ROSBE_HOST_MINGWPATH = "$pwd"
+    $_ROSBE_ORIGINALPATH = "$PATH"
 }
 
 
@@ -44,10 +44,10 @@
 #
 # Set up the GCC 4.x.x build environment.
 #
-$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;
$_ROSBE_ORIGINALPATH"
-$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe"
-$global:_ROSBE_GCCVERSION = $null
-$global:_ROSBE_GCCTARGET = $null
+$ENV:PATH =
"$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
+$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
+#$global:_ROSBE_GCCVERSION = $null
+#$global:_ROSBE_GCCTARGET = $null
 if ($ENV:ROS_ARCH -ne $null) {
     $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string
"gcc version") -replace ".*version ((\d|\.)+).*",'$1'
     $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string 
"target=") -replace ".*--target=(.+?)\b.*",'$1'
@@ -80,10 +80,10 @@
 "gcc target - $_ROSBE_GCCTARGET"
 & ld -v
 }
-if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") {
+if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") {
     & nasm -v
 } else {
-    if (Test-Path "$_ROSBE_MINGWPATH\bin\yasm.exe") {
+    if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\yasm.exe") {
         & yasm --version | select-string "yasm 0"
     } else {
         if ($_ROSBE_MODE -eq "RosBE") {
@@ -91,14 +91,14 @@
         }
     }
 }
-if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") {
+if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") {
     & bison --version | find "GNU Bison"
 } else {
     if ($_ROSBE_MODE -eq "RosBE") {
         "WARNING: Bison will soon be required to build ReactOS, none found in the
current MinGW/GCC."
     }
 }
-if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") {
+if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") {
     $fver = (& flex --version) -replace ".*version
((\d|\.)+).*",'$1'
     "flex $fver"
 } else {