1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN

Liming Gao posted 1 patch 6 years, 7 months ago
Failed in applying to current master (apply log)
BaseTools/toolsetup.bat | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
[edk2] [Patch] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN
Posted by Liming Gao 6 years, 7 months ago 
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 <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
 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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN
Posted by Zhu, Yonghong 6 years, 7 months ago 
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Gao, Liming 
Sent: Friday, August 25, 2017 4:52 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>
Subject: [Patch] BaseTools: Update toolsetup.bat to support the case without EDK_TOOLS_BIN

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 <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
---
 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

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.