From 5d98c319bb4f4cbbff5ef0feec4cbab693140375 Mon Sep 17 00:00:00 2001
From: Liming Gao <liming.gao@intel.com>
Date: Thu, 29 Dec 2016 10:52:00 +0800
Subject: [PATCH] BaseTools toolsetup.bat: Set env when the binary tools are
missing
BASE_TOOLS_PATH is required to be set when the binary tools are missing.
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
BaseTools/toolsetup.bat | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 890521434d..92d0ba8834 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,7 +3,7 @@
@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 - 2016, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2017, 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
@@ -126,7 +126,7 @@ if /I "%1"=="/?" goto Usage
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo.
- goto end
+ goto check_build_environment
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -144,7 +144,7 @@ if /I "%1"=="/?" goto Usage
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo.
- goto end
+ goto check_build_environment
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -280,7 +280,7 @@ goto check_python_tools
echo.
echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
echo.
- goto end
+ goto check_build_environment
:check_python_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment
@@ -307,7 +307,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