import org.tianocore.build.id.PlatformIdentification;\r
import org.tianocore.build.toolchain.ToolChainInfo;\r
import org.tianocore.common.exception.EdkException;\r
-import org.tianocore.common.logger.EdkLog;\r
import org.w3c.dom.Node;\r
\r
/**\r
returns = get("SourceFiles", xPath);\r
\r
if (returns == null || returns.length == 0) {\r
- return new String[0][0];\r
+ return new String[0][3];\r
}\r
\r
Filename[] sourceFileNames = (Filename[]) returns;\r
List<String[]> outputList = new ArrayList<String[]>();\r
for (int i = 0; i < sourceFileNames.length; i++) {\r
List archList = sourceFileNames[i].getSupArchList();\r
- if (arch == null || arch.equalsIgnoreCase("") || archList == null || contains(archList, arch)) {\r
- outputList.add(new String[] {sourceFileNames[i].getToolCode(),sourceFileNames[i].getStringValue()});\r
+ if (arch == null || arch.trim().equalsIgnoreCase("") || archList == null || contains(archList, arch)) {\r
+ outputList.add(new String[] {sourceFileNames[i].getToolCode(), sourceFileNames[i].getStringValue(), sourceFileNames[i].getToolChainFamily()});\r
}\r
}\r
\r
- String[][] outputString = new String[outputList.size()][2];\r
+ String[][] outputString = new String[outputList.size()][3];\r
for (int index = 0; index < outputList.size(); index++) {\r
+ //\r
+ // ToolCode (FileType)\r
+ //\r
outputString[index][0] = outputList.get(index)[0];\r
+ //\r
+ // File name (relative to MODULE_DIR)\r
+ //\r
outputString[index][1] = outputList.get(index)[1];\r
+ //\r
+ // Tool chain family\r
+ //\r
+ outputString[index][2] = outputList.get(index)[2];\r
}\r
return outputString;\r
}\r
guidPair[0] = entry.getCName();\r
guidPair[1] = entry.getGuidValue();\r
guidDeclMap.put(entry.getCName(), guidPair);\r
- EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
- EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[0]);\r
- EdkLog.log(EdkLog.EDK_VERBOSE, guidPair[1]);\r
}\r
return guidDeclMap;\r
}\r
protocolPair[0] = entry.getCName();\r
protocolPair[1] = entry.getGuidValue();\r
protoclMap.put(entry.getCName(), protocolPair);\r
- EdkLog.log(EdkLog.EDK_VERBOSE, entry.getName());\r
- EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[0]);\r
- EdkLog.log(EdkLog.EDK_VERBOSE, protocolPair[1]);\r
}\r
return protoclMap;\r
}\r