Sync BaseTool trunk (version r2649) into EDKII BaseTools.

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 5ddb9b04faa47204fb91a1b9c6fc3d9295b4a9b1..98d0247aa1f356623e7d2dffaaeef56cadf26555 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,10 +3,10 @@
 @REM   however it may be executed directly from the BaseTools project folder\r
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.\r
 @REM\r
-@REM Copyright (c) 2006 - 2008, Intel Corporation.  All rights reserved.\r
+@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
 @REM\r
 @REM This program and the accompanying materials are licensed and made available\r
-@REM under the terms and conditions of the BSD Licensewhich accompanies this \r
+@REM under the terms and conditions of the BSD License which accompanies this \r
 @REM distribution.  The full text of the license may be found at:\r
 @REM   http://opensource.org/licenses/bsd-license.php\r
 @REM\r
@@ -158,14 +158,6 @@ if NOT exist %WORKSPACE%\Conf (
   )\r
 )\r
 \r
-if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (\r
-  if defined RECONFIG echo copying ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db\r
-  copy %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul\r
-) else (\r
-  if defined RECONFIG echo over-write ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db\r
-  if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\FrameworkDatabase.template %WORKSPACE%\Conf\FrameworkDatabase.db > nul\r
-)\r
-\r
 if NOT exist %WORKSPACE%\Conf\target.txt (\r
   echo copying ... target.template to %WORKSPACE%\Conf\target.txt\r
   if NOT exist %EDK_TOOLS_PATH%\Conf\target.template (\r
@@ -261,7 +253,7 @@ goto end
       set PYTHON_HOME=%PYTHONHOME%\r
     ) else (\r
       echo.\r
-      echo  !!! ERROR !!! PYTHON is required to build or execute the tools !!!\r
+      echo  !!! ERROR !!! PYTHON_HOME is required to build or execute the tools, please set it. !!!\r
       echo.\r
       goto end\r
     )\r
@@ -299,16 +291,24 @@ goto end
   echo.\r
 \r
   if defined VCINSTALLDIR goto VisualStudioAvailable\r
-  if defined VS71COMNTOOLS (\r
-    call "%VS71COMNTOOLS%\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
-      echo.\r
-      echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!\r
-      echo.\r
-      goto end\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 !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!\r
+          echo.\r
+          goto end\r
+        )\r
+      )\r
     )\r
   )\r
 \r