From fd6c41f5e24655889c4d2b33f1fb29e318ee3c82 Mon Sep 17 00:00:00 2001
From: jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 10 Oct 2006 04:36:57 +0000
Subject: [PATCH] Fixed EDKT381

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1701 6f19259b-4bc3-4df7-8a09-765794883524
---
 Tools/Conf/BuildMacro.xml                     |  7 ++-
 Tools/Conf/tools_def.template                 | 58 +++++++++----------
 .../org/tianocore/build/GenBuildTask.java     |  4 +-
 3 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 85118fb73f..71814450e5 100644
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -22,7 +22,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <var name="SDB_FILES" value="" />
 
       <if>
-        <isset property="PCH"/>
+        <and>
+          <isset property="PCH"/>
+          <not>
+            <equals arg1="${PCH}" arg2=""/>
+          </not>
+        </and>
         <then>
           <if>
             <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>
diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 1905f230eb..d6ddb84b60 100644
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -309,45 +309,45 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 # Intel EFI Byte Code Compiler (Template)
 #
 ####################################################################################
-
-*_*_EBC_*_FAMILY     = INTEL
-*_*_EBC_PP_NAME      = iec.exe
-*_*_EBC_CC_NAME      = iec.exe
-*_*_EBC_SLINK_NAME   = link.exe
-*_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin
-*_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib
-
-*_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
-*_*_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h 
-*_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h
-*_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
-
+# 
+# *_*_EBC_*_FAMILY     = INTEL
+# *_*_EBC_PP_NAME      = iec.exe
+# *_*_EBC_CC_NAME      = iec.exe
+# *_*_EBC_SLINK_NAME   = link.exe
+# *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin
+# *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib
+# 
+# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC
+# *_*_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h 
+# *_*_EBC_CC_FLAGS      = /nologo /FAcs /c /W3 /WX /DEFI_FIRMWARE_VENDOR=L\"INTEL\" /DSTRING_ARRAY_NAME=${BASE_NAME}Strings /FI${DEST_DIR_DEBUG}/AutoGen.h
+# *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
+# 
 ####################################################################################
 #
 # Intel ACPI Source Language Compiler (Template)
 #
 ####################################################################################
-
-*_*_*_ASL_FAMILY  = INTEL
-*_*_*_ASL_NAME    = iasl.exe
-*_*_IA32_ASL_PATH = C:\ASL
-*_*_X64_ASL_PATH  = C:\ASL
-*_*_IPF_ASL_PATH  = C:\ASL
-*_*_EBC_ASL_PATH  = C:\ASL
-
+# 
+# *_*_*_ASL_FAMILY  = INTEL
+# *_*_*_ASL_NAME    = iasl.exe
+# *_*_IA32_ASL_PATH = C:\ASL
+# *_*_X64_ASL_PATH  = C:\ASL
+# *_*_IPF_ASL_PATH  = C:\ASL
+# *_*_EBC_ASL_PATH  = C:\ASL
+# 
 ####################################################################################
 #
 # Microsoft ACPI Source Language Compiler (Template)
 #
 ####################################################################################
-
-*_*_*_ASL_FAMILY  = MSFT
-*_*_*_ASL_NAME    = asl.exe
-*_*_IA32_ASL_PATH = C:\ASL
-*_*_X64_ASL_PATH  = C:\ASL
-*_*_IPF_ASL_PATH  = C:\ASL
-*_*_EBC_ASL_PATH  = C:\ASL
-
+# 
+# *_*_*_ASL_FAMILY  = MSFT
+# *_*_*_ASL_NAME    = asl.exe
+# *_*_IA32_ASL_PATH = C:\ASL
+# *_*_X64_ASL_PATH  = C:\ASL
+# *_*_IPF_ASL_PATH  = C:\ASL
+# *_*_EBC_ASL_PATH  = C:\ASL
+# 
 
 ####################################################################################
 #
diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index b047fab425..7ce975a60a 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -290,7 +290,7 @@ public class GenBuildTask extends Ant {
                     // don't do anything if no tools found
                     //
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {
-                        EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued.  No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");
+                        EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued.  No tools found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");
                         continue;
                     }
 
@@ -476,6 +476,8 @@ public class GenBuildTask extends Ant {
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;
             String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);
             if (cmdName.length() == 0) {
+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "Warning: " + cmd[m] + " hasn't been defined!");
+                getProject().setProperty(cmd[m], "");
                 continue;
             }
             File cmdFile = new File(cmdPath + File.separatorChar + cmdName);
-- 
2.39.2