[ros-diffs] [dreimer] 45498: Nice regex solution to get GCC's Version from the Target GCC Paths. This fixes the last evil hack to get information from GCC in PS. Biig thx to niski for coming up with that niice solution.

[dreimer at svn.reactos.org]

Author: dreimer
Date: Mon Feb  8 16:13:50 2010
New Revision: 45498

URL: http://svn.reactos.org/svn/reactos?rev=45498&view=rev
Log:
Nice regex solution to get GCC's Version from the Target GCC Paths. This fixes the last evil hack to get information from GCC in PS. Biig thx to niski for coming up with that niice solution.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt

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=45498&r1=45497&r2=45498&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] Mon Feb  8 16:13:50 2010
@@ -3,17 +3,16 @@
 # LICENSE:     GNU General Public License v2. (see LICENSE.txt)
 # FILE:        Root/version.ps1
 # PURPOSE:     Display the current version of GCC, NASM, ld and make.
-# COPYRIGHT:   Copyright 2010 Daniel Reimer <reimer.daniel at freenet.de>
+# COPYRIGHT:   Copyright 2009 Daniel Reimer <reimer.daniel at freenet.de>
 #
 
 (get-WmiObject Win32_OperatingSystem).caption
 
 # GCC
-$TARGETGCC = "$global:_ROSBE_PREFIX" + "gcc"
-& $TARGETGCC -v 2> gcctvers.tmp
-(select-string -path .\gcctvers.tmp "gcc version") -replace ".*:(.*?)\b",'$1'
+[regex]$GCCVer = "4.[0-9].[0-9]"
+$_ROSBE_GCC_TARGET_VERSION = $GCCVer.matches($ENV:ROSBE_TARGET_CXXFLAGS)[0].value
+"gcc version - $_ROSBE_GCC_TARGET_VERSION"
 "gcc target - $ENV:ROS_ARCH"
-remove-item gcctvers.tmp
 
 # LD
 $run = "$_ROSBE_TARGET_MINGWPATH\bin\$_ROSBE_PREFIX" + "ld"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt?rev=45498&r1=45497&r2=45498&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Mon Feb  8 16:13:50 2010
@@ -32,8 +32,9 @@
 - Removed the address translation from the raddr2line script. Its done in the tools now (Daniel Reimer)
 - Fixed the Core detection in makex for PS. Added a global setting to the variable
   containing the number of cores. (Daniel Reimer)
-- Added getincludes from RosBE Unix. This makes the schripts way more logical and fixes a PS Bug
+- Added getincludes from RosBE Unix. This makes the scripts way more logical and fixes a PS Bug
   when you open several Windows at once (Colin Finck, Daniel Reimer)
+- Fix for GCC Version showup together with Colin's new Tool in PS. (Maciej Bialas)
 
 *** Oct 26th, 2009 - RosBE 1.4.5 Released