X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=662ffc00605909cb82b8f834d13636b8bfe4cb54;hp=97e2330e8c68956a166f0a7d7f0ade073fe9c19a;hb=a7ef158b07524f9afd0cefa3180aeac0fcb6e436;hpb=1e6add9e476696461526163bde843570cfdffb39

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