BaseTools: Library hashing fix and optimization for --hash feature

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 97e2330e8c68956a166f0a7d7f0ade073fe9c19a..662ffc00605909cb82b8f834d13636b8bfe4cb54 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -3,13 +3,7 @@
 @REM\r
 @REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 @REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
-@REM This program and the accompanying materials\r
-@REM are licensed and made available under the terms and conditions of the BSD License\r
-@REM which accompanies this distribution.  The full text of the license may be found at\r
-@REM http://opensource.org/licenses/bsd-license.php\r
-@REM\r
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
 \r
 @REM set CYGWIN_HOME=C:\cygwin\r
@@ -42,11 +36,8 @@ if %WORKSPACE% == %CD% (
 \r
 :SetWorkSpace\r
 @REM set new workspace\r
-@REM clear EFI_SOURCE and EDK_SOURCE for the new workspace\r
 if not defined WORKSPACE (\r
   set WORKSPACE=%CD%\r
-  set EFI_SOURCE=\r
-  set EDK_SOURCE=\r
 )\r
 \r
 :ParseArgs\r
@@ -59,29 +50,40 @@ if /I "%1"=="/help" goto Usage
 \r
 if /I "%1"=="NewBuild" shift\r
 if not defined EDK_TOOLS_PATH (\r
-  if exist %WORKSPACE%\BaseTools (\r
-    set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\r
-  ) else (\r
-    if defined PACKAGES_PATH (\r
-      for %%i IN (%PACKAGES_PATH%) DO (\r
-        if exist %%~fi\BaseTools (\r
-          set EDK_TOOLS_PATH=%%~fi\BaseTools\r
-          goto checkNt32Flag\r
-        )\r
+  goto SetEdkToolsPath\r
+) else (\r
+  goto checkNt32Flag\r
+)\r
+\r
+:SetEdkToolsPath\r
+if %WORKSPACE:~-1% EQU \ (\r
+  @set EDK_BASETOOLS=%WORKSPACE%BaseTools\r
+) else (\r
+  @set EDK_BASETOOLS=%WORKSPACE%\BaseTools\r
+)\r
+if exist %EDK_BASETOOLS% (\r
+  set EDK_TOOLS_PATH=%EDK_BASETOOLS%\r
+  set EDK_BASETOOLS=\r
+) else (\r
+  if defined PACKAGES_PATH (\r
+    for %%i IN (%PACKAGES_PATH%) DO (\r
+      if exist %%~fi\BaseTools (\r
+        set EDK_TOOLS_PATH=%%~fi\BaseTools\r
+        goto checkNt32Flag\r
       )\r
-    ) else (\r
-      echo.\r
-      echo !!! ERROR !!! Cannot find BaseTools !!!\r
-      echo.\r
-      goto BadBaseTools\r
     )\r
+  ) else (\r
+    echo.\r
+    echo !!! ERROR !!! Cannot find BaseTools !!!\r
+    echo.\r
+    goto BadBaseTools\r
   )\r
 )\r
 \r
 :checkNt32Flag\r
 if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%\r
 \r
-@REM The Nt32 Emluation Platform requires Microsoft Libraries\r
+@REM The Nt32 Emulation Platform requires Microsoft Libraries\r
 @REM and headers to interface with Windows.\r
 if /I "%1"=="--nt32" (\r
   if /I "%2"=="X64" (\r