[ros-diffs] [dreimer] 40885: Some more cleanup. As in Batch with setlocal all variables are only available inside the script file, not globally. So I removed the Var nulling. Fixed a lil bug in rosbe.ps1 Still tbd: Find out why it sometimes fails with buildno.h not found. Get a proper tee-object for logging

Author: dreimer
Date: Mon May 11 18:38:35 2009
New Revision: 40885

URL: http://svn.reactos.org/svn/reactos?rev=40885&view=rev
Log:
Some more cleanup. As in Batch with setlocal all variables are only available inside the
script file, not globally. So I removed the Var nulling.
Fixed a lil bug in rosbe.ps1

Still tbd:
Find out why it sometimes fails with buildno.h not found.
Get a proper tee-object for logging

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/update.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] Mon May 11 18:38:35
2009
@@ -89,7 +89,8 @@
 
 if ($_ROSBE_WRITELOG -eq 1) {
     $sw.Start()
-    IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" 2>&1 |
tee-object -filepath
"$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt"
+    $file =
"$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt"
+    IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object
$file
     $sw.Stop()
 } else {
     $sw.Start()
@@ -101,23 +102,3 @@
 # Highlight the fact that building has ended.
 "$_ROSBE_BASEDIR\Tools\flash.exe"
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$ENV:ROS_BUILDNOSTRIP = $null
-$ENV:ROS_LEAN_AND_MEAN = $null
-$ENV:CCACHE_DIR = $null
-$ENV:HOST_CC = $null
-$ENV:HOST_CPP = $null
-$ENV:TARGET_CC = $null
-$ENV:TARGET_CPP = $null
-$ENV:ROS_INTERMEDIATE = $null
-$ENV:ROS_OUTPUT = $null
-$ENV:ROS_TEMPORARY = $null
-$TIMERAW = $null
-$DATENAME = $null
-$TIMENAME = $null
-$CPUCOUNT = $null
-$sw = $null
-$_ROSBE_CCACHE = $null

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] Mon May 11 18:38:35
2009
@@ -67,14 +67,6 @@
 
 function end {
     $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-    #
-    # Unload all used Vars.
-    #
-    $OBJCLEANPATH = $null
-    $OUTCLEANPATH = $null
-    $MAKEFILE = $null
-
     exit
 }
 

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon May 11 18:38:35
2009
@@ -249,32 +249,4 @@
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
 
-#
-# Unload all used Vars.
-#
-$YESNO = $null
-$BUILD_MP = $null
-$BUILD_MP_CH = $null
-$TUNE = $null
-$TUNE_CH = $null
-$SARCH_CH = $null
-$OARCH_CH = $null
-$OPTIMIZE_CH = $null
-$KDBG_CH = $null
-$DBG_CH = $null
-$GDB_CH = $null
-$NSWPAT_CH = $null
-$WINKD_CH = $null
-$ELF_CH = $null
-$SARCH = $null
-$OARCH = $null
-$OPTIMIZE = $null
-$KDBG = $null
-$DBG = $null
-$GDB = $null
-$NSWPAT = $null
-$WINKD = $null
-$ELF = $null
-$XML = $null
-
 settitle

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] Mon May 11 18:38:35
2009
@@ -41,8 +41,8 @@
 $global:_ROSBE_OBJPATH = $null
 $global:_ROSBE_OUTPATH = $null
 $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
-$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386"
-$global:_ROSBE_ORIGINALPATH = "$ENV:PATH"
+$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
+$global:_ROSBE_ORIGINALPATH = "$_ROSBE_HOST_MINGWPATH\bin;$ENV:PATH"
 $global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
 
 # Get the number of CPUs in the system so we know how many jobs to execute.
@@ -144,7 +144,7 @@
 
 & "$_ROSBE_BASEDIR\rosbe-gcc-env.ps1"
 
-clear
+clear-host

"*******************************************************************************"
 "*                                                                            
*"
 "*                        ReactOS Build Environment $_ROSBE_VERSION                 
    *"

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon May 11 18:38:35
2009
@@ -29,8 +29,3 @@
 chdefgcc $ENV:ROS_ARCH target
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$ARCH = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Mon May 11
18:38:35 2009
@@ -30,8 +30,3 @@
 
 $global:_ROSBE_ROSSOURCEDIR = "$pwd"
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$SOURCEDIR = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Mon May 11
18:38:35 2009
@@ -63,9 +63,3 @@
     "ERROR: You specified wrong parameters."
     settitle
 }
-
-#
-# Unload all used Vars.
-#
-$TOOLPATH = $null
-$TOOLMODE = $null

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] Mon May 11
18:38:35 2009
@@ -32,6 +32,3 @@
 }
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-$options = $null
-$cfgfile = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Mon May 11
18:38:35 2009
@@ -46,11 +46,3 @@
 }
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$FILEPATH = $null
-$ADDRESS = $null
-$baseaddr = $null
-$relbase = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Mon May 11 18:38:35
2009
@@ -97,14 +97,3 @@
 }
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$OFFSVN = $null
-$ONSVN = $null
-$UP = $null
-$CL = $null
-$dir = dir
-$temparg = $null
-$_ROSBE_SSVN_JOB = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Mon May 11 18:38:35
2009
@@ -34,8 +34,3 @@
 else {parse($args)}
 
 $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
-
-#
-# Unload all used Vars.
-#
-$OUT = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/update.ps1 [iso-8859-1] Mon May 11 18:38:35
2009
@@ -149,13 +149,4 @@
     "Unknown parameter specified. Try 'help update'."
 }
 
-$arg1 = $null
-$arg2 = $null
-$_ROSBE_UPDFINISH = $null
-$_ROSBE_OPATH = $null
-$_ROSBE_UPDDATE = $null
-$_ROSBE_UPDATES = $null
-$_ROSBE_UPDDATE2 = $null
-$_ROSBE_MULTIUPD = $null
-$_ROSBE_STATCOUNT = $null
 EOC