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

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 437858a711b634293771834e6f20b6638e860e82..b79e50521061dc51f6b9876a32e3580feb2a4126 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -682,7 +682,7 @@ public class GlobalData {
     ///\r
     /// Tool Chain Related, try to refine and put some logic process to ToolChainFactory\r
     ///\r
     ///\r
     /// Tool Chain Related, try to refine and put some logic process to ToolChainFactory\r
     ///\r

-    public synchronized static ToolChainInfo getToolChainInfo() {\r
+    public synchronized static ToolChainInfo getToolChainInfo() throws EdkException {\r

         if (toolChainInfo == null) {\r
             toolChainInfo = toolsDef.getConfigInfo().intersection(toolChainEnvInfo);\r
             if (toolChainPlatformInfo != null) {\r
         if (toolChainInfo == null) {\r
             toolChainInfo = toolsDef.getConfigInfo().intersection(toolChainEnvInfo);\r
             if (toolChainPlatformInfo != null) {\r


@@ -690,6 +690,23 @@ public class GlobalData {
             }\r
             toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
             toolChainInfo.normalize();\r
             }\r
             toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
             toolChainInfo.normalize();\r

+\r
+            if (toolChainInfo.getTargets().length == 0) {\r
+                throw new EdkException("No valid target specified! Please check your TARGET definition in Tools/Conf/target.txt.");\r
+            }\r
+\r
+            if (toolChainInfo.getTagnames().length == 0) {\r
+                throw new EdkException("No valid tool chain specified! Please check your TOOL_CHAIN_TAG definition in Tools/Conf/target.txt.");\r
+            }\r
+\r
+            if (toolChainInfo.getArchs().length == 0) {\r
+                throw new EdkException("No valid ARCH specified! Please check your TARGET_ARCH definition in Tools/Conf/target.txt.");\r
+            }\r
+\r
+            if (toolChainInfo.getCommands().length == 0) {\r
+                throw new EdkException("No valid COMMAND specified! Please check your TARGET definition in Tools/Conf/tools_def.txt.");\r
+            }\r
+\r

             EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Current build tool chain information summary: ");\r
             EdkLog.log("Init", EdkLog.EDK_ALWAYS, toolChainInfo + "");\r
         }\r
             EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Current build tool chain information summary: ");\r
             EdkLog.log("Init", EdkLog.EDK_ALWAYS, toolChainInfo + "");\r
         }\r


@@ -724,7 +741,7 @@ public class GlobalData {
         msaFamilyBuildOption.put(moduleId, toolChainOption);\r
     }\r
     \r
         msaFamilyBuildOption.put(moduleId, toolChainOption);\r
     }\r
     \r

-    public static boolean isCommandSet(String target, String toolchain, String arch) {\r
+    public static boolean isCommandSet(String target, String toolchain, String arch) throws EdkException {\r

         String[] commands = getToolChainInfo().getCommands();\r
 \r
         for (int i = 0; i < commands.length; ++i) {\r
         String[] commands = getToolChainInfo().getCommands();\r
 \r
         for (int i = 0; i < commands.length; ++i) {\r

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
index b12c43662c5ab884ad628dd279eec9c1507a5bdd..f78d49f507eede1d81c7699469a112f81a396fbc 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/toolchain/ToolChainConfig.java
@@ -83,6 +83,7 @@ public class ToolChainConfig {
             info.addTagnames(keySet[ToolChainElement.TOOLCHAIN.value]);\r
             info.addArchs(keySet[ToolChainElement.ARCH.value]);\r
             info.addCommands(keySet[ToolChainElement.TOOLCODE.value]);\r
             info.addTagnames(keySet[ToolChainElement.TOOLCHAIN.value]);\r
             info.addArchs(keySet[ToolChainElement.ARCH.value]);\r
             info.addCommands(keySet[ToolChainElement.TOOLCODE.value]);\r

+            info.normalize();\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r