}\r
\r
Set<String> archSet = new LinkedHashSet<String>();\r
-\r
- if ( getProject().getProperty("ARCH") != null) {\r
- String[] fpdArchList = getProject().getProperty("ARCH").split(" ");\r
+ String archString = getProject().getProperty("ARCH");\r
+ if (archString != null) {\r
+ String[] fpdArchList = archString.split(" ");\r
\r
for (int i = 0; i < fpdArchList.length; i++) {\r
if (archListSupByToolChain.contains(fpdArchList[i])) {\r
}\r
\r
if (archList.length == 0) {\r
- EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " was not found in current platform FPD file!\n");\r
+ EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + "[" + archString + "] is not supported for " + moduleId + " in this build!\n");\r
}\r
\r
for (int k = 0; k < archList.length; k++) {\r
getProject().setProperty("FILE_GUID", moduleId.getGuid());\r
getProject().setProperty("VERSION", moduleId.getVersion());\r
getProject().setProperty("MODULE_TYPE", moduleId.getModuleType());\r
- getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));\r
- getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + File.separatorChar + moduleId.getName());\r
+ File msaFile = moduleId.getMsaFile();\r
+ String msaFileName = msaFile.getName();\r
+ getProject().setProperty("MODULE_DIR", msaFile.getParent().replaceAll("(\\\\)", "/"));\r
+ getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") \r
+ + File.separatorChar + msaFileName.substring(0, msaFileName.lastIndexOf('.')));\r
\r
//\r
// SUBSYSTEM\r