Revision: 19434
http://sourceforge.net/p/edk2/code/19434
Author: vanjeff
Date: 2015-12-22 01:19:26 +0000 (Tue, 22 Dec 2015)
Log Message:
-----------
BaseTools: Update Scripts to support VS2015 env
edk2 Edk2Setup.bat depends on those scripts to configure VS env.
Update them to support VS2015.
(Sync patch r19431 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Yonghong Zhu <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19431
Modified Paths:
--------------
branches/UDK2015/BaseTools/Scripts/SetVisualStudio.bat
branches/UDK2015/BaseTools/Scripts/ShowEnvironment.bat
branches/UDK2015/BaseTools/get_vsvars.bat
Modified: branches/UDK2015/BaseTools/Scripts/SetVisualStudio.bat
===================================================================
--- branches/UDK2015/BaseTools/Scripts/SetVisualStudio.bat 2015-12-22
01:11:19 UTC (rev 19433)
+++ branches/UDK2015/BaseTools/Scripts/SetVisualStudio.bat 2015-12-22
01:19:26 UTC (rev 19434)
@@ -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
Modified: branches/UDK2015/BaseTools/Scripts/ShowEnvironment.bat
===================================================================
--- branches/UDK2015/BaseTools/Scripts/ShowEnvironment.bat 2015-12-22
01:11:19 UTC (rev 19433)
+++ branches/UDK2015/BaseTools/Scripts/ShowEnvironment.bat 2015-12-22
01:19:26 UTC (rev 19434)
@@ -55,7 +55,7 @@
@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 @@
@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 @@
@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 "%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
Modified: branches/UDK2015/BaseTools/get_vsvars.bat
===================================================================
--- branches/UDK2015/BaseTools/get_vsvars.bat 2015-12-22 01:11:19 UTC (rev
19433)
+++ branches/UDK2015/BaseTools/get_vsvars.bat 2015-12-22 01:19:26 UTC (rev
19434)
@@ -34,7 +34,6 @@
: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%"
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
