**/\r
package org.tianocore.build.toolchain;\r
\r
-import org.tianocore.build.exception.GenBuildException;\r
-import org.tianocore.build.toolchain.ToolChainKey;\r
-import org.tianocore.build.toolchain.ToolChainMap;\r
-\r
import java.io.File;\r
import java.util.Iterator;\r
import java.util.Set;\r
\r
+import org.apache.tools.ant.Project;\r
+import org.tianocore.build.exception.GenBuildException;\r
+import org.tianocore.build.toolchain.ToolChainKey;\r
+import org.tianocore.build.toolchain.ToolChainMap;\r
+\r
\r
/**\r
\r
\r
@param toolChainFile File object representing the tool chain configuration file\r
**/\r
- public ToolChainConfig (File toolChainFile) throws GenBuildException {\r
- config = getToolChainConfig(toolChainFile);\r
+ public ToolChainConfig (Project prj, File toolChainFile) throws GenBuildException {\r
+ config = getToolChainConfig(prj, toolChainFile);\r
parseToolChainDefKey(config.keySet());\r
}\r
\r
\r
@return ToolChainMap\r
**/\r
- private ToolChainMap getToolChainConfig(File ConfigFile) throws GenBuildException {\r
+ private ToolChainMap getToolChainConfig(Project prj, File ConfigFile) throws GenBuildException {\r
ToolChainMap map = new ToolChainMap();\r
- String[][] toolChainDef = ConfigReader.parse(ConfigFile);\r
+ String[][] toolChainDef = ConfigReader.parse(prj, ConfigFile);\r
\r
for (int i = 0; i < toolChainDef[0].length; ++i) {\r
map.put(toolChainDef[0][i], toolChainDef[1][i]);\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