sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Update Scripts to support VS2015 env

Browse Source 
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.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19431 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao
2015-12-22 01:01:54 +00:00
committed by lgao4
parent 370e695d38
commit 4e06673dbc
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BaseTools/Scripts/SetVisualStudio.bat
View File

@@ -25,6 +25,11 @@
:CheckLatest :CheckLatest
echo. echo.
@if defined VS140COMNTOOLS (
@set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64"
@goto SetVs
)
@if defined VS120COMNTOOLS ( @if defined VS120COMNTOOLS (
@set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64" @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64"
@goto SetVs @goto SetVs

11
BaseTools/Scripts/ShowEnvironment.bat
View File

@@ -130,6 +130,17 @@ if defined SRC_CONF @goto SetEnv
@echo TOOL_CHAIN_TAG = VS2013 @echo TOOL_CHAIN_TAG = VS2013
@goto :EOF @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 @goto :EOF
:SetEnv :SetEnv

1
BaseTools/get_vsvars.bat
View File

@@ -34,7 +34,6 @@ REM (Or invoke the relevant vsvars32 file beforehand).
:main :main
if defined VCINSTALLDIR goto :done if defined VCINSTALLDIR goto :done
if defined VS140COMNTOOLS call :read_vsvars "%VS140COMNTOOLS%" if defined VS140COMNTOOLS call :read_vsvars "%VS140COMNTOOLS%"
if defined VS130COMNTOOLS call :read_vsvars "%VS130COMNTOOLS%"
if defined VS120COMNTOOLS call :read_vsvars "%VS120COMNTOOLS%" if defined VS120COMNTOOLS call :read_vsvars "%VS120COMNTOOLS%"
if defined VS110COMNTOOLS call :read_vsvars "%VS110COMNTOOLS%" if defined VS110COMNTOOLS call :read_vsvars "%VS110COMNTOOLS%"
if defined VS100COMNTOOLS call :read_vsvars "%VS100COMNTOOLS%" if defined VS100COMNTOOLS call :read_vsvars "%VS100COMNTOOLS%"