sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed EDKT381

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1701 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36
2006-10-10 04:36:57 +00:00
parent bc9b370686
commit fd6c41f5e2
3 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/Conf/BuildMacro.xml
View File

@ -22,7 +22,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<var name="SDB_FILES" value="" /> <var name="SDB_FILES" value="" />
<if> <if>
<isset property="PCH"/> <and>
<isset property="PCH"/>
<not>
<equals arg1="${PCH}" arg2=""/>
</not>
</and>
<then> <then>
<if> <if>
<available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/> <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.gch"/>

58
Tools/Conf/tools_def.template
View File

@ -309,45 +309,45 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
# Intel EFI Byte Code Compiler (Template) # Intel EFI Byte Code Compiler (Template)
# #
#################################################################################### ####################################################################################
#
*_*_EBC_*_FAMILY = INTEL # *_*_EBC_*_FAMILY = INTEL
*_*_EBC_PP_NAME = iec.exe # *_*_EBC_PP_NAME = iec.exe
*_*_EBC_CC_NAME = iec.exe # *_*_EBC_CC_NAME = iec.exe
*_*_EBC_SLINK_NAME = link.exe # *_*_EBC_SLINK_NAME = link.exe
*_*_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin # *_*_EBC_*_PATH = C:\Program Files\Intel\EBC\Bin
*_*_EBC_*_SPATH = C:\Program Files\Intel\EBC\Lib\EbcLib.lib # *_*_EBC_*_SPATH = C:\Program Files\Intel\EBC\Lib\EbcLib.lib
#
*_*_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC # *_*_EBC_SLINK_FLAGS = /lib /NOLOGO /MACHINE:EBC
*_*_EBC_PP_FLAGS = /nologo /P /TC /FI${DEST_DIR_DEBUG}/AutoGen.h # *_*_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_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_DLINK_FLAGS = /NOLOGO /MACHINE:EBC /OPT:REF /NODEFAULTLIB /ENTRY:${ENTRYPOINT} /SUBSYSTEM:EFI_BOOT_SERVICE_DRIVER
#
#################################################################################### ####################################################################################
# #
# Intel ACPI Source Language Compiler (Template) # Intel ACPI Source Language Compiler (Template)
# #
#################################################################################### ####################################################################################
#
*_*_*_ASL_FAMILY = INTEL # *_*_*_ASL_FAMILY = INTEL
*_*_*_ASL_NAME = iasl.exe # *_*_*_ASL_NAME = iasl.exe
*_*_IA32_ASL_PATH = C:\ASL # *_*_IA32_ASL_PATH = C:\ASL
*_*_X64_ASL_PATH = C:\ASL # *_*_X64_ASL_PATH = C:\ASL
*_*_IPF_ASL_PATH = C:\ASL # *_*_IPF_ASL_PATH = C:\ASL
*_*_EBC_ASL_PATH = C:\ASL # *_*_EBC_ASL_PATH = C:\ASL
#
#################################################################################### ####################################################################################
# #
# Microsoft ACPI Source Language Compiler (Template) # Microsoft ACPI Source Language Compiler (Template)
# #
#################################################################################### ####################################################################################
#
*_*_*_ASL_FAMILY = MSFT # *_*_*_ASL_FAMILY = MSFT
*_*_*_ASL_NAME = asl.exe # *_*_*_ASL_NAME = asl.exe
*_*_IA32_ASL_PATH = C:\ASL # *_*_IA32_ASL_PATH = C:\ASL
*_*_X64_ASL_PATH = C:\ASL # *_*_X64_ASL_PATH = C:\ASL
*_*_IPF_ASL_PATH = C:\ASL # *_*_IPF_ASL_PATH = C:\ASL
*_*_EBC_ASL_PATH = C:\ASL # *_*_EBC_ASL_PATH = C:\ASL
#
#################################################################################### ####################################################################################
# #

4
Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
View File

@ -290,7 +290,7 @@ public class GenBuildTask extends Ant {
// don't do anything if no tools found // don't do anything if no tools found
// //
if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) { 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; continue;
} }
@ -476,6 +476,8 @@ public class GenBuildTask extends Ant {
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME; key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_NAME;
String cmdName = GlobalData.getCommandSetting(key, fpdModuleId); String cmdName = GlobalData.getCommandSetting(key, fpdModuleId);
if (cmdName.length() == 0) { if (cmdName.length() == 0) {
EdkLog.log(this, EdkLog.EDK_VERBOSE, "Warning: " + cmd[m] + " hasn't been defined!");
getProject().setProperty(cmd[m], "");
continue; continue;
} }
File cmdFile = new File(cmdPath + File.separatorChar + cmdName); File cmdFile = new File(cmdPath + File.separatorChar + cmdName);