MdeModulePkg/PciSioSerial: Fix bad EOL

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index f066d869e1e3f8e146dc8e64a554e50c638da84d..7aa167549bb2d88c08723338641149a43d4dcf0b 100755 (executable)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -2,6 +2,7 @@
 @REM   Windows batch file to setup a WORKSPACE environment\r
 @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
@@ -56,49 +57,6 @@ if /I "%1"=="/h" goto Usage
 if /I "%1"=="/?" goto Usage\r
 if /I "%1"=="/help" goto Usage\r
 \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 VS140COMNTOOLS (\r
-    call "%VS140COMNTOOLS%\vsvars32.bat"\r
-  ) else (\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 VS100COMNTOOLS (\r
-          call "%VS100COMNTOOLS%\vsvars32.bat"\r
-        ) else (\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
-  )\r
-)\r
-shift\r
-\r
-:no_nt32\r
-\r
 if /I "%1"=="NewBuild" shift\r
 if not defined EDK_TOOLS_PATH (\r
   if exist %WORKSPACE%\BaseTools (\r
@@ -108,7 +66,7 @@ if not defined EDK_TOOLS_PATH (
       for %%i IN (%PACKAGES_PATH%) DO (\r
         if exist %%~fi\BaseTools (\r
           set EDK_TOOLS_PATH=%%~fi\BaseTools\r
-          goto checkBaseTools\r
+          goto checkNt32Flag\r
         )\r
       )\r
     ) else (\r
@@ -119,8 +77,22 @@ if not defined EDK_TOOLS_PATH (
     )\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 and headers to interface with Windows.\r
+if /I "%1"=="--nt32" (\r
+  if /I "%2"=="X64" (\r
+    shift\r
+    call "%BASE_TOOLS_PATH%\Scripts\SetVisualStudio.bat"\r
+  ) else (\r
+    call "%BASE_TOOLS_PATH%\get_vsvars.bat"\r
+  )\r
+  shift\r
+)\r
+\r
 :checkBaseTools\r
 IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools\r
 call %EDK_TOOLS_PATH%\toolsetup.bat %*\r
@@ -173,8 +145,16 @@ if "%1"=="" goto end
 \r
 :Usage\r
   @echo.\r
-  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] [Reconfig]"\r
-  @echo         --nt32         Call vsvars32.bat for NT32 platform build.\r
+  @echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig]"\r
+  @echo         --nt32 [X64]   If a compiler tool chain is not available in the\r
+  @echo                        environment, call a script to attempt to set one up.\r
+  @echo                        This flag is only required if building the\r
+  @echo                        Nt32Pkg/Nt32Pkg.dsc system emulator.\r
+  @echo                        If the X64 argument is set, and a compiler tool chain is\r
+  @echo                        not available, attempt to set up a tool chain that will\r
+  @echo                        create X64 binaries. Setting these two options have the\r
+  @echo                        potential side effect of changing tool chains used for a\r
+  @echo                        rebuild.\r
   @echo.\r
   @echo         Reconfig       Reinstall target.txt, tools_def.txt and build_rule.txt.\r
   @echo.\r