From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 2C67221D1E2C3 for ; Fri, 25 Aug 2017 01:49:18 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Aug 2017 01:51:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,424,1498546800"; d="scan'208";a="143801722" Received: from shwde7172.ccr.corp.intel.com ([10.239.9.14]) by fmsmga005.fm.intel.com with ESMTP; 25 Aug 2017 01:51:52 -0700 From: Liming Gao To: edk2-devel@lists.01.org Date: Fri, 25 Aug 2017 16:51:49 +0800 Message-Id: <1503651109-15160-1-git-send-email-liming.gao@intel.com> X-Mailer: git-send-email 2.8.0.windows.1 Subject: [Patch] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Aug 2017 08:49:18 -0000 When EDK_TOOLS_BIN is not set, %EDK_TOOLS_PATH%\Bin\Win32 will be used as the binary tool directory. But, %EDK_TOOLS_PATH%\Bin\Win32 may not exist. On this case, toolsetup.bat should continue to do the other setting, such VS tool chain and tool conf file copy. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao Cc: Yonghong Zhu --- BaseTools/toolsetup.bat | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat index 3801ce0..51c2760 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -118,16 +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 "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%" + 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 ) ) set PATH=%EDK_TOOLS_BIN%;%PATH% @@ -137,16 +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 "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%" + 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 ) ) set PATH=%EDK_TOOLS_BIN%;%PATH% @@ -260,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 -- 2.8.0.windows.1