From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 097048188B for ; Wed, 28 Dec 2016 18:52:09 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga102.fm.intel.com with ESMTP; 28 Dec 2016 18:52:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,424,1477983600"; d="scan'208";a="44179815" Received: from shwde7172.ccr.corp.intel.com ([10.239.9.23]) by orsmga004.jf.intel.com with ESMTP; 28 Dec 2016 18:52:08 -0800 From: Liming Gao To: edk2-devel@lists.01.org Date: Thu, 29 Dec 2016 10:52:00 +0800 Message-Id: <1482979921-20248-2-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 In-Reply-To: <1482979921-20248-1-git-send-email-liming.gao@intel.com> References: <1482979921-20248-1-git-send-email-liming.gao@intel.com> Subject: [Patch 1/2] BaseTools toolsetup.bat: Set env when the binary tools are missing X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Dec 2016 02:52:09 -0000 BASE_TOOLS_PATH is required to be set when the binary tools are missing. Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- BaseTools/toolsetup.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 8905214..88bb29e 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -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 -- 2.8.0.windows.1