BaseTools: Clean up tools_def.template for XCODE5

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 17b723954fa8021a49e62c16d439e63bfab86ddd..3801ce033ff619d50df66cb2bf296f6c26359151 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,7 +3,7 @@
 @REM   however it may be executed directly from the BaseTools project folder\r
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.\r
 @REM\r
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 @REM\r
 @REM This program and the accompanying materials are licensed and made available\r
@@ -121,12 +121,13 @@ if /I "%1"=="/?" goto Usage
     if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
       set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
     ) else (\r
+      set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"\r
       echo.\r
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
       echo. \r
-      goto end\r
+      goto check_build_environment\r
     )\r
   )\r
   set PATH=%EDK_TOOLS_BIN%;%PATH%\r
@@ -139,12 +140,13 @@ if /I "%1"=="/?" goto Usage
     if exist %EDK_TOOLS_PATH%\Bin\Win32 (\r
       set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32\r
     ) else (\r
+      set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"\r
       echo.\r
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!\r
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32\r
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.\r
       echo. \r
-      goto end\r
+      goto check_build_environment\r
     )\r
   )\r
   set PATH=%EDK_TOOLS_BIN%;%PATH%\r
@@ -164,6 +166,14 @@ if not defined WORKSPACE (
    goto skip_reconfig\r
 )\r
 \r
+IF NOT exist "%EDK_TOOLS_PATH%\set_vsprefix_envs.bat" (\r
+  @echo.\r
+  @echo !!! ERROR !!! The set_vsprefix_envs.bat was not found !!!\r
+  @echo.\r
+  goto end\r
+)\r
+call %EDK_TOOLS_PATH%\set_vsprefix_envs.bat\r
+\r
 if not defined CONF_PATH (\r
   set CONF_PATH=%WORKSPACE%\Conf\r
 )\r
@@ -272,7 +282,7 @@ goto check_python_tools
   echo.\r
   echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.\r
   echo.\r
-  goto end\r
+  goto check_build_environment\r
 \r
 :check_python_tools\r
 IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment\r
@@ -299,7 +309,7 @@ goto end
       set PYTHON_HOME=%PYTHONHOME%\r
     ) else (\r
       echo.\r
-      echo  !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set. \r
+      echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set. \r
       echo PYTHON_HOME is required to build or execute the python tools.\r
       echo.\r
       goto end\r