diff options
| author | Liming Gao <liming.gao@intel.com> | 2015-12-22 01:19:26 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@Edk2> | 2015-12-22 01:19:26 +0000 |
| commit | 6eb6ec20158fe7c85b0edea45c57a1512d59581f (patch) | |
| tree | 57420ae69fdd1b1b9994bad9eb4e13b669032c63 /BaseTools/Scripts | |
| parent | c329f50012be7c74842355da1e274b4de16b75d5 (diff) | |
| download | edk2-platforms-6eb6ec20158fe7c85b0edea45c57a1512d59581f.tar.xz | |
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 <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@19434 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Scripts')
| -rwxr-xr-x | BaseTools/Scripts/SetVisualStudio.bat | 5 | ||||
| -rwxr-xr-x | BaseTools/Scripts/ShowEnvironment.bat | 19 |
2 files changed, 20 insertions, 4 deletions
diff --git a/BaseTools/Scripts/SetVisualStudio.bat b/BaseTools/Scripts/SetVisualStudio.bat index d379cd73df..de2f91274d 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 2b320fbc21..5dd30b45a4 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
|