diff options
| author | Cinnamon Shia <cinnamon.shia@hpe.com> | 2016-11-04 10:19:46 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2016-11-05 09:10:58 +0800 |
| commit | 3b25ca839bf84ff53f11e969698b85a51b8efb96 (patch) | |
| tree | 21617f09548ccbb6687a377f4a9ea2d07d9b3123 /Edk2Setup.bat | |
| parent | 7e7a8116640605be83528ab12837e71c6a2accae (diff) | |
| download | edk2-3b25ca839bf84ff53f11e969698b85a51b8efb96.zip edk2-3b25ca839bf84ff53f11e969698b85a51b8efb96.tar.gz edk2-3b25ca839bf84ff53f11e969698b85a51b8efb96.tar.bz2 | |
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 <cinnamon.shia@hpe.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Diffstat (limited to 'Edk2Setup.bat')
| -rwxr-xr-x | Edk2Setup.bat | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Edk2Setup.bat b/Edk2Setup.bat index 68f46dc..017e88d 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
|