[ros-diffs] [dreimer] 44645: Cleanup of the PS Scripts. (every time i read through the, i find more crap.)

Author: dreimer
Date: Fri Dec 18 09:36:53 2009
New Revision: 44645

URL: http://svn.reactos.org/svn/reactos?rev=44645&view=rev
Log:
Cleanup of the PS Scripts. (every time i read through the, i find more crap.)

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/version.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] Fri Dec 18 09:36:53
2009
@@ -26,8 +26,6 @@
 }
     $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc"
     $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++"
-    $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc"
-    $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++"
     $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" +
"gcc"
     $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$_ROSBE_PREFIX" +
"g++"
 

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] Fri Dec 18 09:36:53
2009
@@ -25,14 +25,12 @@
 }
 if ("$ENV:ROS_ARCH" -eq "amd64") {
     (Get-Host).UI.RawUI.ForegroundColor = 0xB
-    (Get-Host).UI.RawUI.BackgroundColor = 0x0
 } elseif ("$ENV:ROS_ARCH" -eq "arm") {
     (Get-Host).UI.RawUI.ForegroundColor = 0x9
-    (Get-Host).UI.RawUI.BackgroundColor = 0x0
 } else {
     (Get-Host).UI.RawUI.ForegroundColor = 0xA
-    (Get-Host).UI.RawUI.BackgroundColor = 0x0
 }
+(Get-Host).UI.RawUI.BackgroundColor = 0x0
 clear-host
 
 $global:0 = $myInvocation.MyCommand.Definition

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Fri Dec 18
09:36:53 2009
@@ -7,8 +7,6 @@
 #
 
 $host.ui.RawUI.WindowTitle = "Options"
-
-$options="$_ROSBE_BASEDIR\Tools\options.exe"
 
 if ("$ENV:ROS_ARCH" -ne "i386") {
     $param = "$ENV:ROS_ARCH"
@@ -20,9 +18,9 @@
 
 # Run options.exe
 
-if (Test-Path "$options") {
+if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") {
     Push-Location "$_ROSBE_BASEDIR"
-    &{IEX "& 'options' $param"} | out-null
+    &options.exe $param | out-null
     Pop-Location
     if (Test-Path "$cfgfile") {
         & "$cfgfile"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Fri Dec 18
09:36:53 2009
@@ -16,7 +16,7 @@
 remove-item gcctvers.tmp
 
 # LD
-$run = "$_ROSBE_TARGET_MINGWPATH\bin\$global:_ROSBE_PREFIX" + "ld"
+$run = "$_ROSBE_TARGET_MINGWPATH\bin\$_ROSBE_PREFIX" + "ld"
 & "$run" -v
 
 # NASM or YASM