SecurityPkg: Add TPM PTP support in TCG2 SMM.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index ba775ce2da09019c6c53424106ca7485d30fb94c..b69bd26857f573bc37c9e05437d6adb513bd0380 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @REM\r
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<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
@@ -42,9 +42,11 @@ if %WORKSPACE% == %CD% (
 :SetWorkSpace\r
 @REM set new workspace\r
 @REM clear EFI_SOURCE and EDK_SOURCE for the new workspace\r
-set WORKSPACE=%CD%\r
-set EFI_SOURCE=\r
-set EDK_SOURCE=\r
+if not defined WORKSPACE (\r
+  set WORKSPACE=%CD%\r
+  set EFI_SOURCE=\r
+  set EDK_SOURCE=\r
+)\r
 \r
 :ParseArgs\r
 if /I "%1"=="-h" goto Usage\r
@@ -61,24 +63,32 @@ if /I not "%1"=="--nt32" goto no_nt32
 @REM and headers to interface with Windows.\r
 \r
 if not defined VCINSTALLDIR (\r
-  if defined VS110COMNTOOLS (\r
-    call "%VS110COMNTOOLS%\vsvars32.bat"\r
+  if defined VS140COMNTOOLS (\r
+    call "%VS140COMNTOOLS%\vsvars32.bat"\r
   ) else (\r
-    if defined VS100COMNTOOLS (\r
-      call "%VS100COMNTOOLS%\vsvars32.bat"\r
-    ) else (\r
-      if defined VS90COMNTOOLS (\r
-        call "%VS90COMNTOOLS%\vsvars32.bat"\r
+    if defined VS120COMNTOOLS (\r
+      call "%VS120COMNTOOLS%\vsvars32.bat"\r
+    ) else (   \r
+      if defined VS110COMNTOOLS (\r
+        call "%VS110COMNTOOLS%\vsvars32.bat"\r
       ) else (\r
-        if defined VS80COMNTOOLS (\r
-          call "%VS80COMNTOOLS%\vsvars32.bat"\r
+        if defined VS100COMNTOOLS (\r
+          call "%VS100COMNTOOLS%\vsvars32.bat"\r
         ) else (\r
-          if defined VS71COMNTOOLS (\r
-            call "%VS71COMNTOOLS%\vsvars32.bat"\r
+          if defined VS90COMNTOOLS (\r
+            call "%VS90COMNTOOLS%\vsvars32.bat"\r
           ) else (\r
-            echo.\r
-            echo !!! WARNING !!! Cannot find Visual Studio !!!\r
-            echo.\r
+            if defined VS80COMNTOOLS (\r
+              call "%VS80COMNTOOLS%\vsvars32.bat"\r
+            ) else (\r
+              if defined VS71COMNTOOLS (\r
+                call "%VS71COMNTOOLS%\vsvars32.bat"\r
+              ) else (\r
+                echo.\r
+                echo !!! WARNING !!! Cannot find Visual Studio !!!\r
+                echo.\r
+              )\r
+            )\r
           )\r
         )\r
       )\r
@@ -88,8 +98,28 @@ if not defined VCINSTALLDIR (
 shift\r
 \r
 :no_nt32\r
+\r
 if /I "%1"=="NewBuild" shift\r
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\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 checkBaseTools\r
+      )\r
+    )\r
+  ) else (\r
+    echo.\r
+    echo !!! ERROR !!! Cannot find BaseTools !!!\r
+    echo. \r
+    goto BadBaseTools\r
+  )\r
+)\r
+if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%\r
+\r
+:checkBaseTools\r
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
 call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
 if /I "%1"=="Reconfig" shift\r