[ros-diffs] [dreimer] 47777: Make using the System Path Variable optional again, because make suffers from a bug with path variables with () in it. This makes RosBE almost unuseable in 64 bit Windows.

Author: dreimer
Date: Mon Jun 14 10:49:27 2010
New Revision: 47777

URL: http://svn.reactos.org/svn/reactos?rev=47777&view=rev
Log:
Make using the System Path Variable optional again, because make suffers from a bug with
path variables with () in it. This makes RosBE almost unuseable in 64 bit Windows.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd

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 Jun 14 10:49:27
2010
@@ -64,10 +64,10 @@
 $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
 $global:_BUILDBOT_SVNSKIPMAINTRUNK = "0"
 
-if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") {
+if ("$ENV:_ROSBE_SYSPATH" -eq "1") {
+    $global:_ROSBE_ORIGINALPATH =
"$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH"
+} else {
     $global:_ROSBE_ORIGINALPATH =
"$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\"
-} else {
-    $global:_ROSBE_ORIGINALPATH =
"$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:PATH"
 }
 
 # Fix Bison package path (just in case RosBE is installed in a path which contains
spaces)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Jun 14 10:49:27 2010
@@ -41,7 +41,12 @@
 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%
 set _BUILDBOT_SVNSKIPMAINTRUNK=0
 
-set
_ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH%
+set
_ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem"
+
+::
+:: Enable this one, if you want to use the System Path Var inside RosBE.
+::
+REM set
_ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH%
 
 :: Fix Bison package path (just in case RosBE is installed in a path which contains
spaces)
 set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison