From 3b25ca839bf84ff53f11e969698b85a51b8efb96 Mon Sep 17 00:00:00 2001 From: Cinnamon Shia Date: Fri, 4 Nov 2016 10:19:46 +0800 Subject: [PATCH] Edk2Setup.bat: Fix build errors from VS tools PREFIX ENV missing BaseTools/set_vsprefix_envs.bat is introduced for setting the PREFIX ENV of VS tools in tools_def.template. For example: DEFINE VS2015_BIN = ENV(VS2015_PREFIX)Vc\bin DEFINE VS2015_DLL = ENV(VS2015_PREFIX)Common7\IDE;DEF(VS2015_BIN) DEFINE VS2015_BINX64 = DEF(VS2015_BIN)\x86_amd64 The issue is EdkSetup.bat calls BaseTools\set_vsprefix_envs.bat but Edk2Setup.bat does not. Edk2Setup.bat should call BaseTools/set_vsprefix_envs.bat to set up the PREFIX ENV of VS tools. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Cinnamon Shia Reviewed-by: Yonghong Zhu --- Edk2Setup.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Edk2Setup.bat b/Edk2Setup.bat index 68f46dc426..017e88de86 100755 --- a/Edk2Setup.bat +++ b/Edk2Setup.bat @@ -355,6 +355,15 @@ @if defined REBUILD_TOOLS goto SetConf @if defined SVN_PULL goto SetConf +@REM call set_vsprefix_envs.bat to set up the PREFIX env for VS tool path. +@IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" ( + @echo. + @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!! + @echo. + @goto ExitFailure +) +@call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat + @echo. @echo Rebuilding of the tools is not required. Binaries of the latest, @echo tested versions of the tools have been tested and included in the -- 2.39.2