CorebootPayloadPkg: Use extra braces to prevent gcc compile fail

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 6e526cdd03c6c12b4cd85177a23358bcd527b1d6..25a5a6e8d7e37f11ab7f0ffd8c4f332c6e16514e 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 - 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
@@ -61,24 +61,28 @@ 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 VS120COMNTOOLS (\r
+    call "%VS120COMNTOOLS%\vsvars32.bat"\r
   ) else (\r
-    if defined VS100COMNTOOLS (\r
-      call "%VS100COMNTOOLS%\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
-        if defined VS80COMNTOOLS (\r
-          call "%VS80COMNTOOLS%\vsvars32.bat"\r
+        if defined VS90COMNTOOLS (\r
+          call "%VS90COMNTOOLS%\vsvars32.bat"\r
         ) else (\r
-          if defined VS71COMNTOOLS (\r
-            call "%VS71COMNTOOLS%\vsvars32.bat"\r
+          if defined VS80COMNTOOLS (\r
+            call "%VS80COMNTOOLS%\vsvars32.bat"\r
           ) else (\r
-            echo.\r
-            echo !!! WARNING !!! Cannot find Visual Studio !!!\r
-            echo.\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
@@ -89,7 +93,7 @@ shift
 \r
 :no_nt32\r
 if /I "%1"=="NewBuild" shift\r
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools\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
@@ -110,6 +114,13 @@ goto check_cygwin
   goto end\r
 \r
 :check_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
@@ -117,9 +128,10 @@ goto check_cygwin
     @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
@@ -129,8 +141,8 @@ goto end
   @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
 \r