FatBinPkg: Update EBC/IA32/X64/IPF binaries

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 33301542785f07a53a536983988802ad4c6f76af..25a5a6e8d7e37f11ab7f0ffd8c4f332c6e16514e 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,8 +1,8 @@
 @REM @file\r
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @REM\r
-@REM Copyright (c) 2006 - 2008, Intel Corporation\r
-@REM All rights reserved. This program and the accompanying materials\r
+@REM Copyright (c) 2006 - 2014, 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
 @REM http://opensource.org/licenses/bsd-license.php\r
@@ -31,12 +31,12 @@ pushd .
 cd %~dp0\r
 \r
 if not defined WORKSPACE (\r
-  @goto SetWorkSpace\r
+  goto SetWorkSpace\r
 )\r
 \r
 if %WORKSPACE% == %CD% (\r
   @REM Workspace is not changed.\r
-  @goto ParseArgs\r
+  goto ParseArgs\r
 )\r
 \r
 :SetWorkSpace\r
@@ -47,32 +47,44 @@ set EFI_SOURCE=
 set EDK_SOURCE=\r
 \r
 :ParseArgs\r
-@if /I "%1"=="-h" goto Usage\r
-@if /I "%1"=="-help" goto Usage\r
-@if /I "%1"=="--help" goto Usage\r
-@if /I "%1"=="/h" goto Usage\r
-@if /I "%1"=="/?" goto Usage\r
-@if /I "%1"=="/help" goto Usage\r
+if /I "%1"=="-h" goto Usage\r
+if /I "%1"=="-help" goto Usage\r
+if /I "%1"=="--help" goto Usage\r
+if /I "%1"=="/h" goto Usage\r
+if /I "%1"=="/?" goto Usage\r
+if /I "%1"=="/help" goto Usage\r
 \r
-@if /I not "%1"=="--nt32" goto no_nt32\r
+if /I not "%1"=="--nt32" goto no_nt32\r
 \r
 @REM Flag, --nt32 is set\r
 @REM The Nt32 Emluation Platform requires Microsoft Libraries\r
 @REM and headers to interface with Windows.\r
 \r
 if not defined VCINSTALLDIR (\r
-  if defined VS71COMNTOOLS (\r
-    call "%VS71COMNTOOLS%\vsvars32.bat"\r
+  if defined VS120COMNTOOLS (\r
+    call "%VS120COMNTOOLS%\vsvars32.bat"\r
   ) else (\r
-    if defined VS80COMNTOOLS (\r
-      call "%VS80COMNTOOLS%\vsvars32.bat"\r
+    if defined VS110COMNTOOLS (\r
+      call "%VS110COMNTOOLS%\vsvars32.bat"\r
     ) else (\r
-      if defined VS90COMNTOOLS (\r
-        call "%VS90COMNTOOLS%\vsvars32.bat"\r
+      if defined VS100COMNTOOLS (\r
+        call "%VS100COMNTOOLS%\vsvars32.bat"\r
       ) else (\r
-        echo.\r
-        echo !!! WARNING !!! Cannot find Visual Studio !!!\r
-        echo.\r
+        if defined VS90COMNTOOLS (\r
+          call "%VS90COMNTOOLS%\vsvars32.bat"\r
+        ) else (\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
   )\r
@@ -80,38 +92,46 @@ if not defined VCINSTALLDIR (
 shift\r
 \r
 :no_nt32\r
-@if /I "%1"=="NewBuild" shift\r
-@if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\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
-@goto check_cygwin\r
+if /I "%1"=="NewBuild" shift\r
+set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\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
+goto check_cygwin\r
 \r
 :BadBaseTools\r
   @REM\r
-  @REM Need the BaseTools Package in order to build\r
+  REM Need the BaseTools Package in order to build\r
   @REM\r
-  echo.\r
-  echo !!! ERROR !!! The BaseTools Package was not found !!!\r
-  echo.\r
-  echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,\r
-  echo For example,\r
-  echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools\r
-  echo The setup script, toolsetup.bat must reside in this folder.\r
-  echo.\r
-  @goto end\r
+  @echo.\r
+  @echo !!! ERROR !!! The BaseTools Package was not found !!!\r
+  @echo.\r
+  @echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,\r
+  @echo For example,\r
+  @echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools\r
+  @echo The setup script, toolsetup.bat must reside in this folder.\r
+  @echo.\r
+  goto end\r
 \r
 :check_cygwin\r
-  @if exist c:\cygwin (\r
-    @set CYGWIN_HOME=c:\cygwin\r
+if defined CYGWIN_HOME (\r
+  if not exist "%CYGWIN_HOME%" (\r
+    @echo.\r
+    @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!\r
+    @echo.\r
+  )\r
+) else (\r
+  if exist c:\cygwin (\r
+    set CYGWIN_HOME=c:\cygwin\r
   ) else (\r
     @echo.\r
     @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!\r
     @echo.\r
   )\r
+)\r
 \r
-@if NOT "%1"=="" goto Usage\r
-@goto end\r
+:cygwin_done\r
+if "%1"=="" goto end\r
 \r
 :Usage\r
   @echo.\r
@@ -121,12 +141,11 @@ shift
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo.\r
   @echo  Note that target.template, tools_def.template and build_rules.template\r
-  @echo  will be only copied to target.txt, tools_def.txt and build_rule.txt\r
-  @echo  respectively if they do not exist. Using option [Reconfig] to force the copy. \r
+  @echo  will only be copied to target.txt, tools_def.txt and build_rule.txt\r
+  @echo  respectively if they do not exist. Use option [Reconfig] to force the copy.\r
   @echo.\r
-  @goto end\r
+  goto end\r
 \r
 :end\r
-  @popd\r
-  @echo on\r
+  popd\r
 \r