tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools/toolsetup: Do not set CONF_PATH when already set. 

When CONF_PATH is already set, toolsetup.bat overwrites its value.
This is not the case on Linux platforms (BuildEnv) and
contra-productive when using the same Workspace across multiple
Operating Systems.
With this patch, a check is performed prior to setting the variable.
Furthermore, it will not be scanned for Conf directories in
PACKAGES_PATH directories to respect the user's choice.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Marvin Haeuser 2016-07-20 23:02:27 +08:00 committed by Yonghong Zhu
parent 03630a8148
commit 1f2cd65297
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BaseTools/toolsetup.bat
View File

@ -160,13 +160,16 @@ if not defined WORKSPACE (
goto skip_reconfig
)
set CONF_PATH=%WORKSPACE%\Conf
if NOT exist %CONF_PATH% (
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
if exist %%~fi\Conf (
set CONF_PATH=%%i\Conf
goto CopyConf
if not defined CONF_PATH (
set CONF_PATH=%WORKSPACE%\Conf
if NOT exist %CONF_PATH% (
if defined PACKAGES_PATH (
for %%i IN (%PACKAGES_PATH%) DO (
if exist %%~fi\Conf (
set CONF_PATH=%%i\Conf
goto CopyConf
)
)
)
)