Fixed EDKT381

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1701 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 85118fb73faad5e828bdbd0aabe3dc5551df9597..71814450e532cb9b266fa9857052cef43fef195a 100644 (file)
--- 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="" />\r
 \r
       <if>\r
       <var name="SDB_FILES" value="" />\r
 \r
       <if>\r

-        <isset property="PCH"/>\r
+        <and>\r
+          <isset property="PCH"/>\r
+          <not>\r
+            <equals arg1="${PCH}" arg2=""/>\r
+          </not>\r
+        </and>\r

         <then>\r
           <if>\r
             <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>\r
         <then>\r
           <if>\r
             <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>\r

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 1905f230ebb0c7ae8135f3f56a57b65331bf4654..d6ddb84b60912dc0639dbb53ec637a33756ff98d 100644 (file)
--- 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)\r
 #\r
 ####################################################################################\r
 # Intel EFI Byte Code Compiler (Template)\r
 #\r
 ####################################################################################\r

-\r
-*_*_EBC_*_FAMILY     = INTEL\r
-*_*_EBC_PP_NAME      = iec.exe\r
-*_*_EBC_CC_NAME      = iec.exe\r
-*_*_EBC_SLINK_NAME   = link.exe\r
-*_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
-*_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib\r
-\r
-*_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
-*_*_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
-*_*_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\r
-*_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
-\r
+# \r
+# *_*_EBC_*_FAMILY     = INTEL\r
+# *_*_EBC_PP_NAME      = iec.exe\r
+# *_*_EBC_CC_NAME      = iec.exe\r
+# *_*_EBC_SLINK_NAME   = link.exe\r
+# *_*_EBC_*_PATH       = C:\Program Files\Intel\EBC\Bin\r
+# *_*_EBC_*_SPATH      = C:\Program Files\Intel\EBC\Lib\EbcLib.lib\r
+# \r
+# *_*_EBC_SLINK_FLAGS   = /lib /NOLOGO /MACHINE:EBC\r
+# *_*_EBC_PP_FLAGS      = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h \r
+# *_*_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\r
+# *_*_EBC_DLINK_FLAGS   = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER\r
+# \r

 ####################################################################################\r
 #\r
 # Intel ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
 ####################################################################################\r
 #\r
 # Intel ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r

-\r
-*_*_*_ASL_FAMILY  = INTEL\r
-*_*_*_ASL_NAME    = iasl.exe\r
-*_*_IA32_ASL_PATH = C:\ASL\r
-*_*_X64_ASL_PATH  = C:\ASL\r
-*_*_IPF_ASL_PATH  = C:\ASL\r
-*_*_EBC_ASL_PATH  = C:\ASL\r
-\r
+# \r
+# *_*_*_ASL_FAMILY  = INTEL\r
+# *_*_*_ASL_NAME    = iasl.exe\r
+# *_*_IA32_ASL_PATH = C:\ASL\r
+# *_*_X64_ASL_PATH  = C:\ASL\r
+# *_*_IPF_ASL_PATH  = C:\ASL\r
+# *_*_EBC_ASL_PATH  = C:\ASL\r
+# \r

 ####################################################################################\r
 #\r
 # Microsoft ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r
 ####################################################################################\r
 #\r
 # Microsoft ACPI Source Language Compiler (Template)\r
 #\r
 ####################################################################################\r

-\r
-*_*_*_ASL_FAMILY  = MSFT\r
-*_*_*_ASL_NAME    = asl.exe\r
-*_*_IA32_ASL_PATH = C:\ASL\r
-*_*_X64_ASL_PATH  = C:\ASL\r
-*_*_IPF_ASL_PATH  = C:\ASL\r
-*_*_EBC_ASL_PATH  = C:\ASL\r
-\r
+# \r
+# *_*_*_ASL_FAMILY  = MSFT\r
+# *_*_*_ASL_NAME    = asl.exe\r
+# *_*_IA32_ASL_PATH = C:\ASL\r
+# *_*_X64_ASL_PATH  = C:\ASL\r
+# *_*_IPF_ASL_PATH  = C:\ASL\r
+# *_*_EBC_ASL_PATH  = C:\ASL\r
+# \r

 \r
 ####################################################################################\r
 #\r
 \r
 ####################################################################################\r
 #\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index b047fab425d674af9c6c48fa61027b293b0dfc65..7ce975a60ad3a94b2064db1e689d9a55a57d3f65 100644 (file)
--- 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\r
                     //\r
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
                     // don't do anything if no tools found\r
                     //\r
                     if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r

-                        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");\r
+                        EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued.  No tools found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r

                         continue;\r
                     }\r
 \r
                         continue;\r
                     }\r
 \r


@@ -476,6 +476,8 @@ public class GenBuildTask extends Ant {
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;\r
             String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);\r
             if (cmdName.length() == 0) {\r
             key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;\r
             String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);\r
             if (cmdName.length() == 0) {\r

+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "Warning: " + cmd[m] + " hasn't been defined!");\r
+                getProject().setProperty(cmd[m], "");\r

                 continue;\r
             }\r
             File cmdFile = new File(cmdPath + File.separatorChar + cmdName);\r
                 continue;\r
             }\r
             File cmdFile = new File(cmdPath + File.separatorChar + cmdName);\r