[ros-diffs] [dreimer] 37782: Some fixes. Thx goes out to PS 2.0 Graphical Tool

Author: dreimer
Date: Sun Nov 30 17:34:41 2008
New Revision: 37782

URL: http://svn.reactos.org/svn/reactos?rev=37782&view=rev
Log:
Some fixes. Thx goes out to PS 2.0 Graphical Tool

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sun Nov 30 17:34:41
2008
@@ -168,7 +168,7 @@
     ""
     "    all  - Removes build logs and compiler output in the RosBE-Logs
directory."
     "    logs - Removes all build logs in the RosBE-Logs directory."
-    "    All other commands will be parsed as "make COMMAND_clean" and
cleans the"
+    "    All other commands will be parsed as ""make
COMMAND_clean"" and cleans the"
     "    specific command."
     exit
 }

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- 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] Sun Nov 30
17:34:41 2008
@@ -79,17 +79,17 @@
     $ENV:TARGET_CPPFLAGS =
"-I""$_ROSBE_TARGET_MINGWPATH\include""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION""
-I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET""
-I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include"""
 }
 if ($_ROSBE_HOST_GCCVERSION -eq "3.4.5") {
-    $ENV:PATH =
$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH
-    $_ROSBE_MINGWMAKE = $_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe
+    $ENV:PATH =
"$_ROSBE_BASEDIR\3.4.5\bin;$_ROSBE_BASEDIR\3.4.5\libexec\gcc\mingw32\3.4.5;$ENV:PATH"
+    $_ROSBE_MINGWMAKE = "$_ROSBE_BASEDIR\3.4.5\bin\mingw32-make.exe"
     # Set all paths (needed by Windows Vista)
-    $ENV:C_INCLUDE_PATH =
$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include
-    $ENV:CPLUS_INCLUDE_PATH =
$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include
-    $ENV:LIBRARY_PATH =
$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5
+    $ENV:C_INCLUDE_PATH =
"$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include"
+    $ENV:CPLUS_INCLUDE_PATH =
"$_ROSBE_BASEDIR\3.4.5\include;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5;$_ROSBE_BASEDIR\3.4.5\include\c++\3.4.5\mingw32;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5\include"
+    $ENV:LIBRARY_PATH =
"$_ROSBE_BASEDIR\3.4.5\lib;$_ROSBE_BASEDIR\3.4.5\lib\gcc\mingw32\3.4.5"
     $ENV:HOST_CFLAGS = $null
     $ENV:HOST_CPPFLAGS = $null
     $ENV:TARGET_CFLAGS = $null
     $ENV:TARGET_CPPFLAGS = $null
-)
+}
 #
 # Display the current version of GCC, NASM, ld and make.
 #
@@ -115,14 +115,14 @@
     }
 }
 if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\bison.exe") {
-    & bison --version | find "GNU Bison"
+    & bison '--version' | select-string "GNU Bison"
 } else {
     if ($_ROSBE_MODE -eq "RosBE") {
         "WARNING: Bison will soon be required to build ReactOS, none found in the
current MinGW/GCC."
     }
 }
 if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") {
-    $fver = (& flex --version) -replace ".*version
((\d|\.)+).*",'$1'
+    $fver = (& flex '--version') -replace ".*version
((\d|\.)+).*",'$1'
     "flex $fver"
 } else {
     if ($_ROSBE_MODE -eq "RosBE") {