Sync basetools' source and binary files with r1707 of the basetools project.

[mirror_edk2.git] / BaseTools / toolsetup.bat

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 58b05d5a4efbd5aa4afeba8614ccc66b2854cb71..36cd9d2491b17788a5830312d616972f6b11696c 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 Copyright (c) 2006 - 2008, Intel Corporation.  All rights reserved.\r
+@REM Copyright (c) 2006 - 2009, Intel Corporation.  All rights reserved.\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
@@ -159,7 +159,7 @@ if NOT exist %WORKSPACE%\Conf (
 )\r
 \r
 if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (\r
-  if defined RECONFIG echo copying ... FrameworkDatabase.template to %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 echo over-write ... FrameworkDatabase.template to %WORKSPACE%\Conf\FrameworkDatabase.db\r
@@ -168,6 +168,9 @@ if NOT exist %WORKSPACE%\Conf\FrameworkDatabase.db (
 \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
   if defined RECONFIG echo over-write ... target.template to %WORKSPACE%\Conf\target.txt\r
@@ -176,6 +179,9 @@ if NOT exist %WORKSPACE%\Conf\target.txt (
 \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
   if defined RECONFIG echo over-write ... tools_def.template to %WORKSPACE%\Conf\tools_def.txt\r
@@ -184,6 +190,9 @@ if NOT exist %WORKSPACE%\Conf\tools_def.txt (
 \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
   if defined RECONFIG echo over-write ... build_rule.template to %WORKSPACE%\Conf\build_rule.txt\r
@@ -252,7 +261,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