New EDK Shell binary(r63).

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 2f657ba9677015d3be7959d8332f0303a0a1ee2a..561cc408cb7f30cbb0e0db517304f9c605be55e4 100755 (executable)
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -3,7 +3,7 @@
 @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   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 - 2012, 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\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


@@ -131,7 +131,7 @@ pushd .
   )\r
   echo EDK_TOOLS_PATH      = %EDK_TOOLS_PATH%\r
   if defined BASE_TOOLS_PATH (\r
   )\r
   echo EDK_TOOLS_PATH      = %EDK_TOOLS_PATH%\r
   if defined BASE_TOOLS_PATH (\r

-    echo BASE_TOOLS_PATH     = %EDK_TOOLS_PATH%\r
+    echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%\r

   )\r
   echo.\r
 \r
   )\r
   echo.\r
 \r


@@ -158,31 +158,36 @@ if NOT exist %WORKSPACE%\Conf (
   )\r
 )\r
 \r
   )\r
 )\r
 \r

-if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (\r
-  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 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 %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
+    echo Error: target.template is missing at folder %EDK_TOOLS_PATH%\Conf\\r
+  )\r

   copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul\r
 ) else (\r
   copy %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul\r
 ) else (\r

+  if defined RECONFIG echo over-write ... target.template to %WORKSPACE%\Conf\target.txt\r

   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul\r
 )\r
 \r
 if NOT exist %WORKSPACE%\Conf\tools_def.txt (\r
   echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r
   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\target.template %WORKSPACE%\Conf\target.txt > nul\r
 )\r
 \r
 if NOT exist %WORKSPACE%\Conf\tools_def.txt (\r
   echo copying ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r

+  if NOT exist %EDK_TOOLS_PATH%\Conf\tools_def.template (\r
+    echo Error: tools_def.template is missing at folder %EDK_TOOLS_PATH%\Conf\\r
+  )\r

   copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul\r
 ) else (\r
   copy %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul\r
 ) else (\r

+  if defined RECONFIG echo over-write ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r

   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul\r
 )\r
 \r
 if NOT exist %WORKSPACE%\Conf\build_rule.txt (\r
   echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\tools_def.template %WORKSPACE%\Conf\tools_def.txt > nul\r
 )\r
 \r
 if NOT exist %WORKSPACE%\Conf\build_rule.txt (\r
   echo copying ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r

+  if NOT exist %EDK_TOOLS_PATH%\Conf\build_rule.template (\r
+    echo Error: build_rule.template is missing at folder %EDK_TOOLS_PATH%\Conf\\r
+  )\r

   copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul\r
 ) else (\r
   copy %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul\r
 ) else (\r

+  if defined RECONFIG echo over-write ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r

   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul\r
 )\r
 \r
   if defined RECONFIG copy /Y %EDK_TOOLS_PATH%\Conf\build_rule.template %WORKSPACE%\Conf\build_rule.txt > nul\r
 )\r
 \r


@@ -226,7 +231,7 @@ goto end
     echo tested versions of the tools have been tested and included in the\r
     echo EDK II repository.\r
     echo.\r
     echo tested versions of the tools have been tested and included in the\r
     echo EDK II repository.\r
     echo.\r

-    echo If you really want to build the tools, use the FORCE_REBUILD option.\r
+    echo If you really want to build the tools, use the ForceRebuild option.\r

     echo.\r
     goto end\r
   )\r
     echo.\r
     goto end\r
   )\r


@@ -248,7 +253,7 @@ goto end
       set PYTHON_HOME=%PYTHONHOME%\r
     ) else (\r
       echo.\r
       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
       echo.\r
       goto end\r
     )\r


@@ -286,16 +291,24 @@ goto end
   echo.\r
 \r
   if defined VCINSTALLDIR goto VisualStudioAvailable\r
   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
   ) else (\r

-    if defined VS80COMNTOOLS (\r
-      call "%VS80COMNTOOLS%\vsvars32.bat"\r
+    if defined VS90COMNTOOLS (\r
+      call "%VS90COMNTOOLS%\vsvars32.bat"\r

     ) else (\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
     )\r
   )\r
 \r