tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added code to check that the definitions in target.txt are valid against tools_def.txt 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1898 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jwang36 2006-11-06 03:09:32 +00:00
parent f55618484b
commit 2b0fe8b4a4
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
View File

@ -682,7 +682,7 @@ public class GlobalData {
///
/// Tool Chain Related, try to refine and put some logic process to ToolChainFactory
///
public synchronized static ToolChainInfo getToolChainInfo() {
public synchronized static ToolChainInfo getToolChainInfo() throws EdkException {
if (toolChainInfo == null) {
toolChainInfo = toolsDef.getConfigInfo().intersection(toolChainEnvInfo);
if (toolChainPlatformInfo != null) {
@ -690,6 +690,23 @@ public class GlobalData {
}
toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());
toolChainInfo.normalize();
if (toolChainInfo.getTargets().length == 0) {
throw new EdkException("No valid target specified! Please check your TARGET definition in Tools/Conf/target.txt.");
}
if (toolChainInfo.getTagnames().length == 0) {
throw new EdkException("No valid tool chain specified! Please check your TOOL_CHAIN_TAG definition in Tools/Conf/target.txt.");
}
if (toolChainInfo.getArchs().length == 0) {
throw new EdkException("No valid ARCH specified! Please check your TARGET_ARCH definition in Tools/Conf/target.txt.");
}
if (toolChainInfo.getCommands().length == 0) {
throw new EdkException("No valid COMMAND specified! Please check your TARGET definition in Tools/Conf/tools_def.txt.");
}
EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Current build tool chain information summary: ");
EdkLog.log("Init", EdkLog.EDK_ALWAYS, toolChainInfo + "");
}
@ -724,7 +741,7 @@ public class GlobalData {
msaFamilyBuildOption.put(moduleId, toolChainOption);
}
public static boolean isCommandSet(String target, String toolchain, String arch) {
public static boolean isCommandSet(String target, String toolchain, String arch) throws EdkException {
String[] commands = getToolChainInfo().getCommands();
for (int i = 0; i < commands.length; ++i) {

1
Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
View File

@ -83,6 +83,7 @@ public class ToolChainConfig {
info.addTagnames(keySet[ToolChainElement.TOOLCHAIN.value]);
info.addArchs(keySet[ToolChainElement.ARCH.value]);
info.addCommands(keySet[ToolChainElement.TOOLCODE.value]);
info.normalize();
}
}