BaseTools: Use absolute import in Scripts

[mirror_edk2.git] / BaseTools / Scripts / ShowEnvironment.bat

diff --git a/BaseTools/Scripts/ShowEnvironment.bat b/BaseTools/Scripts/ShowEnvironment.bat
old mode 100644 (file)
new mode 100755 (executable)
index c4613e1..5dd30b4
--- a/BaseTools/Scripts/ShowEnvironment.bat
+++ b/BaseTools/Scripts/ShowEnvironment.bat
@@ -47,13 +47,15 @@ if defined SRC_CONF @goto SetEnv
 @echo #############################################################################\r
 @if defined WORKSPACE @echo     WORKSPACE            = %WORKSPACE%\r
 @if not defined WORKSPACE @echo     WORKSPACE            = Not Set\r
+@if defined PACKAGES_PATH @echo     PACKAGES_PATH        = %PACKAGES_PATH%\r
 @if defined EDK_TOOLS_PATH @echo     EDK_TOOLS_PATH       = %EDK_TOOLS_PATH%\r
 @if not defined EDK_TOOLS_PATH @echo     EDK_TOOLS_PATH       = Not Set\r
 @if defined BASE_TOOLS_PATH @echo     BASE_TOOLS_PATH      = %BASE_TOOLS_PATH%\r
+@if defined EDK_TOOLS_BIN @echo     EDK_TOOLS_BIN        = %EDK_TOOLS_BIN%\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
@@ -128,6 +130,17 @@ if defined SRC_CONF @goto SetEnv
     @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
@@ -151,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
-@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
@@ -169,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
-    \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
-    \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