edk2 Edk2Setup.bat depends on those scripts to configure VS env.
Update them to support VS2015.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
BaseTools/Scripts/SetVisualStudio.bat | 5 +++++
BaseTools/Scripts/ShowEnvironment.bat | 19 +++++++++++++++----
BaseTools/get_vsvars.bat | 1 -
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/BaseTools/Scripts/SetVisualStudio.bat
b/BaseTools/Scripts/SetVisualStudio.bat
index d379cd7..de2f912 100755
--- a/BaseTools/Scripts/SetVisualStudio.bat
+++ b/BaseTools/Scripts/SetVisualStudio.bat
@@ -25,6 +25,11 @@
:CheckLatest
echo.
+@if defined VS140COMNTOOLS (
+ @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio
14.0\VC\bin\x86_amd64"
+ @goto SetVs
+)
+
@if defined VS120COMNTOOLS (
@set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio
12.0\VC\bin\x86_amd64"
@goto SetVs
diff --git a/BaseTools/Scripts/ShowEnvironment.bat
b/BaseTools/Scripts/ShowEnvironment.bat
index 2b320fb..5dd30b4 100755
--- a/BaseTools/Scripts/ShowEnvironment.bat
+++ b/BaseTools/Scripts/ShowEnvironment.bat
@@ -55,7 +55,7 @@ if defined SRC_CONF @goto SetEnv
@if defined PYTHON_FREEZER_PATH @echo PYTHON_FREEZER_PATH =
%PYTHON_FREEZER_PATH%
@if "%NT32PKG%"=="TRUE" (
@echo.
- @echo NOTE: Please configure your build to use the following
TOOL_CHAIN_TAG
+ @echo NOTE: Please configure your build to use the following TOOL_CHAIN_TAG
@echo when building NT32Pkg/Nt32Pkg.dsc
@if defined VCINSTALLDIR @call :CheckVsVer
@set TEST_VS=
@@ -130,6 +130,17 @@ if defined SRC_CONF @goto SetEnv
@echo TOOL_CHAIN_TAG = VS2013
@goto :EOF
)
+
+@set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\"
+@if "%VSINSTALLDIR%"=="%TEST_VS%" (
+ @echo TOOL_CHAIN_TAG = VS2015x86
+ @goto :EOF
+)
+@set "TEST_VS=C:\Program Files\Microsoft Visual Studio 14.0\"
+@if "%VSINSTALLDIR%"=="%TEST_VS%" (
+ @echo TOOL_CHAIN_TAG = VS2015
+ @goto :EOF
+)
@goto :EOF
:SetEnv
@@ -153,7 +164,7 @@ if defined SRC_CONF @goto SetEnv
@copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt"
> nul
@set FIRST_COPY=TRUE
)
-@if not exist "%WORKSPACE%\Conf\build_rule.txt" (
+@if not exist "%WORKSPACE%\Conf\build_rule.txt" (
@if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates
@echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt
@copy /Y "%SRC_CONF%\build_rule.template"
"%WORKSPACE%\Conf\build_rule.txt" > nul
@@ -171,11 +182,11 @@ if defined SRC_CONF @goto SetEnv
@if "%MISSING_TARGET_TEMPLATE%"=="TRUE" @goto MissingTemplates
@echo over-write ... target.template to %WORKSPACE%\Conf\target.txt
@copy /Y "%SRC_CONF%\target.template" "%WORKSPACE%\Conf\target.txt" > nul
-
+
@if "%MISSING_TOOLS_DEF_TEMPLATE%"=="TRUE" @goto MissingTemplates
@echo over-write ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt
@copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt"
> nul
-
+
@if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates
@echo over-write ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt
@copy /Y "%SRC_CONF%\build_rule.template"
"%WORKSPACE%\Conf\build_rule.txt" > nul
diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat
index b67a81d..7649e1d 100644
--- a/BaseTools/get_vsvars.bat
+++ b/BaseTools/get_vsvars.bat
@@ -34,7 +34,6 @@ REM (Or invoke the relevant vsvars32 file beforehand).
:main
if defined VCINSTALLDIR goto :done
if defined VS140COMNTOOLS call :read_vsvars "%VS140COMNTOOLS%"
- if defined VS130COMNTOOLS call :read_vsvars "%VS130COMNTOOLS%"
if defined VS120COMNTOOLS call :read_vsvars "%VS120COMNTOOLS%"
if defined VS110COMNTOOLS call :read_vsvars "%VS110COMNTOOLS%"
if defined VS100COMNTOOLS call :read_vsvars "%VS100COMNTOOLS%"
--
1.9.5.msysgit.0
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
