[ros-diffs] [dreimer] 40901: OK, not the last commit. fully removing the CCACHE variable is a not soo good idea. Revert this. Delete the tmp files you generate!

[dreimer at svn.reactos.org]

Author: dreimer
Date: Tue May 12 19:36:02 2009
New Revision: 40901

URL: http://svn.reactos.org/svn/reactos?rev=40901&view=rev
Log:
OK, not the last commit.
fully removing the CCACHE variable is a not soo good idea. Revert this.
Delete the tmp files you generate!

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.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/Powershell/Build.ps1?rev=40901&r1=40900&r2=40901&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] Tue May 12 19:36:02 2009
@@ -55,7 +55,7 @@
 if ($_ROSBE_USECCACHE -eq 1) {
     $_ROSBE_CCACHE = "ccache "
 } else {
-    remove-variable _ROSBE_CCACHE
+    $_ROSBE_CCACHE = $null
 }
     $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc"
     $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++"

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=40901&r1=40900&r2=40901&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] Tue May 12 19:36:02 2009
@@ -19,6 +19,7 @@
 & $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'
+remove-item gcctvers.tmp
 gcc -v 2> gcchvers.tmp
 $global:_ROSBE_HOST_GCCVERSION = (select-string -path .\gcchvers.tmp "gcc version") -replace ".*version ((\d|\.)+).*",'$1'
 $global:_ROSBE_HOST_GCCTARGET = (select-string -path .\gcchvers.tmp "target=") -replace ".*--target=(.+?)\b.*",'$1'

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1?rev=40901&r1=40900&r2=40901&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Tue May 12 19:36:02 2009
@@ -9,6 +9,7 @@
 (get-WmiObject Win32_OperatingSystem).caption
 
 # GCC
+& $TARGETGCC -v 2> gcctvers.tmp
 (select-string -path .\gcctvers.tmp "gcc version") -replace ".*: (.+?)\b",'$1' | % { $str = $_ -replace '^.*14:',''}
 $str
 "gcc target - $_ROSBE_GCCTARGET"