X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2Ftoolsetup.bat;h=33d50f58ad87df6909ae7dbcc691cd5503e3789e;hb=68bef3f0c7c71da2f065fd348efa79f04799d347;hp=92d0ba8834c94f371cb16800bb7ff6a1430c130c;hpb=5d98c319bb4f4cbbff5ef0feec4cbab693140375;p=mirror_edk2.git

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 92d0ba8834..33d50f58ad 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -1,18 +1,18 @@
 @REM @file
-@REM   This stand-alone program is typically called by the edksetup.bat file, 
+@REM   This stand-alone program is typically called by the edksetup.bat file,
 @REM   however it may be executed directly from the BaseTools project folder
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.
 @REM
-@REM Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 @REM
 @REM This program and the accompanying materials are licensed and made available
-@REM under the terms and conditions of the BSD License which accompanies this 
+@REM under the terms and conditions of the BSD License which accompanies this
 @REM distribution.  The full text of the license may be found at:
 @REM   http://opensource.org/licenses/bsd-license.php
 @REM
 @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR 
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
 @REM IMPLIED.
 @REM
 
@@ -118,15 +118,13 @@ if /I "%1"=="/?" goto Usage
 :set_PATH
   if defined WORKSPACE_TOOLS_PATH goto check_PATH
   if not defined EDK_TOOLS_BIN (
-    if exist %EDK_TOOLS_PATH%\Bin\Win32 (
-      set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
-    ) else (
+    set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
+    if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
       echo.
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
-      echo. 
-      goto check_build_environment
+      echo.
     )
   )
   set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -136,15 +134,13 @@ if /I "%1"=="/?" goto Usage
 :check_PATH
   if "%EDK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto PATH_ok
   if not defined EDK_TOOLS_BIN (
-    if exist %EDK_TOOLS_PATH%\Bin\Win32 (
-      set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
-    ) else (
+    set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
+    if not exist %EDK_TOOLS_PATH%\Bin\Win32 (
       echo.
       echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
       echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
       echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
-      echo. 
-      goto check_build_environment
+      echo.
     )
   )
   set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -186,7 +182,7 @@ if NOT exist %CONF_PATH% (
     )
   )
 )
- 
+
 :CopyConf
 if NOT exist %CONF_PATH% (
   mkdir %CONF_PATH%
@@ -258,6 +254,7 @@ echo.
 if defined FORCE_REBUILD goto check_build_environment
 if defined REBUILD goto check_build_environment
 if not exist "%EDK_TOOLS_PATH%" goto check_build_environment
+if not exist "%EDK_TOOLS_BIN%"  goto check_build_environment
 
 IF NOT EXIST "%EDK_TOOLS_BIN%\BootSectImage.exe" goto check_c_tools
 IF NOT EXIST "%EDK_TOOLS_BIN%\EfiLdrImage.exe" goto check_c_tools
@@ -307,7 +304,7 @@ goto end
       set PYTHON_HOME=%PYTHONHOME%
     ) else (
       echo.
-      echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set. 
+      echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set.
       echo PYTHON_HOME is required to build or execute the python tools.
       echo.
       goto end
@@ -320,12 +317,12 @@ goto end
     echo !!! WARNING !!! PYTHON_FREEZER_PATH environment variable is not set.
     echo Setup environment to run Python scripts directly.
     echo.
-    set "PATH=%PATH%;%BASE_TOOLS_PATH%\BinWrappers\WindowsLike"
+    set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
   )
 
   set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
   set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
-  
+
   echo                PATH = %PATH%
   echo         PYTHON_HOME = %PYTHON_HOME%
   echo          PYTHONPATH = %PYTHONPATH%
@@ -388,11 +385,11 @@ goto end
   @echo.
   echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"
   @echo.
-  @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path. 
+  @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path.
   @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.
-  @echo         Rebuild           If sources are available perform an Incremental build, only 
+  @echo         Rebuild           If sources are available perform an Incremental build, only
   @echo                           build those updated tools.
-  @echo         ForceRebuild      If sources are available, rebuild all tools regardless of 
+  @echo         ForceRebuild      If sources are available, rebuild all tools regardless of
   @echo                           whether they have been updated or not.
   @echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.
   @echo.