From 485eb3a252b21becb5bace55320ddbfdc8e1c83f Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Thu, 8 Oct 2015 09:29:36 +0000 Subject: BaseTools: Update Edk2Setup.bat to support multiple workspaces Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao Reviewed-by: Wu Hao A git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18583 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Scripts/SetVisualStudio.bat | 2 +- BaseTools/Scripts/ShowEnvironment.bat | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'BaseTools') diff --git a/BaseTools/Scripts/SetVisualStudio.bat b/BaseTools/Scripts/SetVisualStudio.bat index a302a83..d379cd7 100755 --- a/BaseTools/Scripts/SetVisualStudio.bat +++ b/BaseTools/Scripts/SetVisualStudio.bat @@ -68,7 +68,7 @@ if not exist "%COMMONTOOLSx64%\vcvarsx86_amd64.bat" ( @goto End :RebuildTools -@call python "%WORKSPACE%\BaseTools\Scripts\UpdateBuildVersions.py" +@call python "%BASE_TOOLS_PATH%\Scripts\UpdateBuildVersions.py" @set "BIN_DIR=%EDK_TOOLS_PATH%\Bin\Win32" if not exist "%BIN_DIR%" @mkdir "%BIN_DIR%" @echo Removing temporary and binary files diff --git a/BaseTools/Scripts/ShowEnvironment.bat b/BaseTools/Scripts/ShowEnvironment.bat index c4613e1..2b320fb 100755 --- a/BaseTools/Scripts/ShowEnvironment.bat +++ b/BaseTools/Scripts/ShowEnvironment.bat @@ -47,9 +47,11 @@ if defined SRC_CONF @goto SetEnv @echo ############################################################################# @if defined WORKSPACE @echo WORKSPACE = %WORKSPACE% @if not defined WORKSPACE @echo WORKSPACE = Not Set +@if defined PACKAGES_PATH @echo PACKAGES_PATH = %PACKAGES_PATH% @if defined EDK_TOOLS_PATH @echo EDK_TOOLS_PATH = %EDK_TOOLS_PATH% @if not defined EDK_TOOLS_PATH @echo EDK_TOOLS_PATH = Not Set @if defined BASE_TOOLS_PATH @echo BASE_TOOLS_PATH = %BASE_TOOLS_PATH% +@if defined EDK_TOOLS_BIN @echo EDK_TOOLS_BIN = %EDK_TOOLS_BIN% @if defined PYTHON_FREEZER_PATH @echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH% @if "%NT32PKG%"=="TRUE" ( @echo. -- cgit v1.1