[ros-diffs] [dreimer] 40883: This fixes the worst errors. Now the Scripts build ROS again. I could need a tester.

[dreimer at svn.reactos.org]

Author: dreimer
Date: Mon May 11 04:53:37 2009
New Revision: 40883

URL: http://svn.reactos.org/svn/reactos?rev=40883&view=rev
Log:
This fixes the worst errors. Now the Scripts build ROS again. I could need a tester.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.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/Powershell/Build.ps1?rev=40883&r1=40882&r2=40883&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 04:53:37 2009
@@ -63,7 +63,6 @@
     $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++"
     $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "gcc"
     $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "$ROS_PREFIX" + "g++"
-}
 
 # Get the current date and time for use in in our build log's file name.
 $TIMERAW = get-date -f t

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1?rev=40883&r1=40882&r2=40883&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon May 11 04:53:37 2009
@@ -23,9 +23,9 @@
 # Set defaults to work with and override them if edited by
 # the options utility.
 if ("$ENV:ROS_ARCH" -eq "") {
-    set $ENV:ROS_ARCH = "i386"
+    $ENV:ROS_ARCH = "i386"
 } else {
-    set $ENV:ROS_ARCH = "$args[1]"
+    $ENV:ROS_ARCH = "$args[1]"
 }
 
 $global:0 = $myInvocation.MyCommand.Definition
@@ -144,7 +144,7 @@
 
 & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1"
 
-clear-screen
+clear
 "*******************************************************************************"
 "*                                                                             *"
 "*                        ReactOS Build Environment $_ROSBE_VERSION                      *"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1?rev=40883&r1=40882&r2=40883&view=diff
==============================================================================
--- 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] Mon May 11 04:53:37 2009
@@ -15,8 +15,8 @@
 }
 
 $ENV:PATH = "$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
-
-& "$ENV:ROS_PREFIXgcc" -v 2> gcctvers.tmp
+$TARGETGCC = "$ENV:ROS_PREFIX" + "gcc"
+& $TARGETGCC -v 2> gcctvers.tmp
 $global:_ROSBE_TARGET_GCCVERSION = (select-string -path .\gcctvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1'
 $global:_ROSBE_TARGET_GCCTARGET = (select-string -path .\gcctvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1'
 gcc -v 2> gcchvers.tmp