BaseTools: Update Scripts to support VS2015 env

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

diff --git a/BaseTools/Scripts/SetVisualStudio.bat b/BaseTools/Scripts/SetVisualStudio.bat
index d379cd73dff4d3159eb30d215f5f0f800e2993ef..de2f91274d32ad9745fe7856178566d89bfbc580 100755 (executable)
--- a/BaseTools/Scripts/SetVisualStudio.bat
+++ b/BaseTools/Scripts/SetVisualStudio.bat
@@ -25,6 +25,11 @@
 \r
 :CheckLatest\r
 echo.\r
 \r
 :CheckLatest\r
 echo.\r

+@if defined VS140COMNTOOLS (\r
+   @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\x86_amd64"\r
+   @goto SetVs\r
+)\r
+\r

 @if defined VS120COMNTOOLS (\r
    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64"\r
    @goto SetVs\r
 @if defined VS120COMNTOOLS (\r
    @set "COMMONTOOLSx64=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin\x86_amd64"\r
    @goto SetVs\r

diff --git a/BaseTools/Scripts/ShowEnvironment.bat b/BaseTools/Scripts/ShowEnvironment.bat
index 2b320fbc2152a5a2ffc2dcd865ac42903495fb1a..5dd30b45a4b5049364617140d2b948372e121b3a 100755 (executable)
--- 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%\r
 @if "%NT32PKG%"=="TRUE" (\r
     @echo.\r
 @if defined PYTHON_FREEZER_PATH @echo     PYTHON_FREEZER_PATH  = %PYTHON_FREEZER_PATH%\r
 @if "%NT32PKG%"=="TRUE" (\r
     @echo.\r

-    @echo NOTE: Please configure your build to use the following TOOL_CHAIN_TAG \r
+    @echo NOTE: Please configure your build to use the following TOOL_CHAIN_TAG\r

     @echo       when building NT32Pkg/Nt32Pkg.dsc\r
     @if defined VCINSTALLDIR @call :CheckVsVer\r
     @set TEST_VS=\r
     @echo       when building NT32Pkg/Nt32Pkg.dsc\r
     @if defined VCINSTALLDIR @call :CheckVsVer\r
     @set TEST_VS=\r


@@ -130,6 +130,17 @@ if defined SRC_CONF @goto SetEnv
     @echo     TOOL_CHAIN_TAG       = VS2013\r
     @goto :EOF\r
 )\r
     @echo     TOOL_CHAIN_TAG       = VS2013\r
     @goto :EOF\r
 )\r

+\r
+@set "TEST_VS=C:\Program Files (x86)\Microsoft Visual Studio 14.0\"\r
+@if "%VSINSTALLDIR%"=="%TEST_VS%" (\r
+    @echo     TOOL_CHAIN_TAG       = VS2015x86\r
+    @goto :EOF\r
+)\r
+@set "TEST_VS=C:\Program Files\Microsoft Visual Studio 14.0\"\r
+@if "%VSINSTALLDIR%"=="%TEST_VS%" (\r
+    @echo     TOOL_CHAIN_TAG       = VS2015\r
+    @goto :EOF\r
+)\r

 @goto :EOF\r
 \r
 :SetEnv\r
 @goto :EOF\r
 \r
 :SetEnv\r


@@ -153,7 +164,7 @@ if defined SRC_CONF @goto SetEnv
     @copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt" > nul\r
     @set FIRST_COPY=TRUE\r
 )\r
     @copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt" > nul\r
     @set FIRST_COPY=TRUE\r
 )\r

-@if not exist "%WORKSPACE%\Conf\build_rule.txt" (   \r
+@if not exist "%WORKSPACE%\Conf\build_rule.txt" (\r

     @if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
     @copy /Y "%SRC_CONF%\build_rule.template" "%WORKSPACE%\Conf\build_rule.txt" > nul\r
     @if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
     @copy /Y "%SRC_CONF%\build_rule.template" "%WORKSPACE%\Conf\build_rule.txt" > nul\r


@@ -171,11 +182,11 @@ if defined SRC_CONF @goto SetEnv
     @if "%MISSING_TARGET_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... target.template to %WORKSPACE%\Conf\target.txt\r
     @copy /Y "%SRC_CONF%\target.template" "%WORKSPACE%\Conf\target.txt" > nul\r
     @if "%MISSING_TARGET_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... target.template to %WORKSPACE%\Conf\target.txt\r
     @copy /Y "%SRC_CONF%\target.template" "%WORKSPACE%\Conf\target.txt" > nul\r

-    \r
+\r

     @if "%MISSING_TOOLS_DEF_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r
     @copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt" > nul\r
     @if "%MISSING_TOOLS_DEF_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r
     @copy /Y "%SRC_CONF%\tools_def.template" "%WORKSPACE%\Conf\tools_def.txt" > nul\r

-    \r
+\r

     @if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
     @copy /Y "%SRC_CONF%\build_rule.template" "%WORKSPACE%\Conf\build_rule.txt" > nul\r
     @if "%MISSING_BUILD_RULE_TEMPLATE%"=="TRUE" @goto MissingTemplates\r
     @echo over-write ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
     @copy /Y "%SRC_CONF%\build_rule.template" "%WORKSPACE%\Conf\build_rule.txt" > nul\r

diff --git a/BaseTools/get_vsvars.bat b/BaseTools/get_vsvars.bat
index b67a81d78052a58765c93473271475cb38f8b9bc..7649e1dccf4701e2bca23f26c4ab85bd4ffac45e 100644 (file)
--- a/BaseTools/get_vsvars.bat
+++ b/BaseTools/get_vsvars.bat
@@ -34,7 +34,6 @@ REM       (Or invoke the relevant vsvars32 file beforehand).
 :main\r
 if defined VCINSTALLDIR goto :done\r
   if defined VS140COMNTOOLS  call :read_vsvars  "%VS140COMNTOOLS%"\r
 :main\r
 if defined VCINSTALLDIR goto :done\r
   if defined VS140COMNTOOLS  call :read_vsvars  "%VS140COMNTOOLS%"\r

-  if defined VS130COMNTOOLS  call :read_vsvars  "%VS130COMNTOOLS%"\r

   if defined VS120COMNTOOLS  call :read_vsvars  "%VS120COMNTOOLS%"\r
   if defined VS110COMNTOOLS  call :read_vsvars  "%VS110COMNTOOLS%"\r
   if defined VS100COMNTOOLS  call :read_vsvars  "%VS100COMNTOOLS%"\r
   if defined VS120COMNTOOLS  call :read_vsvars  "%VS120COMNTOOLS%"\r
   if defined VS110COMNTOOLS  call :read_vsvars  "%VS110COMNTOOLS%"\r
   if defined VS100COMNTOOLS  call :read_vsvars  "%VS100COMNTOOLS%"\r