mirror of
https://github.com/reactos/RosBE.git
synced 2024-11-30 14:50:33 +00:00
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.
svn path=/trunk/tools/RosBE/; revision=1219
This commit is contained in:
parent
1035aee3dd
commit
d48849ed9b
@ -64,10 +64,10 @@ $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386"
|
||||
$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH"
|
||||
$global:_BUILDBOT_SVNSKIPMAINTRUNK = "0"
|
||||
|
||||
if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") {
|
||||
$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\"
|
||||
} else {
|
||||
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\"
|
||||
}
|
||||
|
||||
# Fix Bison package path (just in case RosBE is installed in a path which contains spaces)
|
||||
|
@ -41,7 +41,12 @@ set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user