public class FpdFileContents {\r
\r
static final String xmlNs = "http://www.TianoCore.org/2006/Edk2.0";\r
+ static final String regExpNewLineAndSpaces = "((\n)|(\r\n)|(\r)|(\u0085)|(\u2028)|(\u2029))(\\s)*";\r
\r
private PlatformSurfaceAreaDocument fpdd = null;\r
\r
return fpdFrameworkModules;\r
}\r
\r
- public void getFrameworkModuleGuid (String fvName, Vector<String> vGuid) {\r
+ public void getFrameworkModuleSAByFvBinding (String fvName, Vector<String[]> vGuid) {\r
if (getFrameworkModulesCount() == 0){\r
return;\r
}\r
\r
String[] fvNames = fvBinding.split(" ");\r
for (int i = 0; i < fvNames.length; ++i) {\r
+ //\r
+ // BugBug : underscore "_" should not be replaced!!! \r
+ // But Fv name FVMAIN from fdf file not consist with FV_MAIN in fpd file.\r
+ //\r
if (fvNames[i].equals(fvName) || fvNames[i].replaceAll("_", "").equals(fvName)) {\r
- vGuid.add(moduleSa.getModuleGuid());\r
+ String[] sa = new String[] {moduleSa.getModuleGuid(), moduleSa.getModuleVersion(),\r
+ moduleSa.getPackageGuid(), moduleSa.getPackageVersion(), \r
+ listToString(moduleSa.getSupArchList())};\r
+ vGuid.add(sa);\r
break;\r
}\r
}\r
}\r
\r
cursor.push();\r
- cursor.toPrevToken();\r
+ while (cursor.hasPrevToken()) {\r
+ cursor.toPrevToken();\r
+ if (!cursor.isText()) {\r
+ break;\r
+ }\r
+ String s = cursor.getTextValue();\r
+ if (s.matches(regExpNewLineAndSpaces)) {\r
+ continue;\r
+ }\r
+ }\r
+\r
if (cursor.isComment()) {\r
cursor.removeXml();\r
}\r
+ \r
cursor.pop();\r
cursor.removeXml();\r
if (getFrameworkModulesCount() == 0) {\r
vMi.add(libMi);\r
}\r
\r
- try {\r
nextPcd:for (int i = 0; i < saaModuleSaPcd.length; ++i) {\r
\r
for (int j = 0; j < vMi.size(); ++j) {\r
removePcdData(seqModuleSa, saaModuleSaPcd[i][0], saaModuleSaPcd[i][1]);\r
dataModified = true;\r
}\r
- }\r
- catch (Exception e) {\r
- throw e;\r
- }\r
//\r
// add new Pcd from MSA file to ModuleSA.\r
//\r
- try {\r
- \r
- for (int i = 0; i < vMi.size(); ++i) {\r
+ for (int i = 0; i < vMi.size(); ++i) {\r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea) WorkspaceProfile\r
.getModuleXmlObject(vMi\r
.get(i));\r
}\r
\r
}\r
- }\r
- catch (Exception e){\r
- throw e;\r
- }\r
\r
return dataModified;\r
}\r
return false;\r
}\r
\r
+ private boolean multiSourcePcd (String cName, String tsGuidCName, String moduleKey) {\r
+ int libCount = getLibraryInstancesCount(moduleKey);\r
+ String[][] saaLib = new String[libCount][5];\r
+ getLibraryInstances(moduleKey, saaLib);\r
+ ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
+ Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
+ //\r
+ // create vector for module & library instance MIs.\r
+ //\r
+ vMi.add(mi);\r
+ for (int j = 0; j < saaLib.length; ++j) {\r
+ String libKey = saaLib[j][1] + " " + saaLib[j][2] + " " + saaLib[j][3] + " " + saaLib[j][4];\r
+ ModuleIdentification libMi = WorkspaceProfile.getModuleId(libKey);\r
+ vMi.add(libMi);\r
+ }\r
+ \r
+ int pcdSourceCount = 0;\r
+ for (int i = 0; i < vMi.size(); ++i) {\r
+ if (WorkspaceProfile.pcdInMsa(cName, tsGuidCName, vMi.get(i))) {\r
+ pcdSourceCount++;\r
+ }\r
+ }\r
+ \r
+ if (pcdSourceCount < 2) {\r
+ return false;\r
+ }\r
+ else {\r
+ return true;\r
+ }\r
+ \r
+ }\r
+ \r
/**Remove PCDBuildDefinition entries from ModuleSA\r
* @param moduleKey identifier of ModuleSA.\r
* @param consumer where these entries come from.\r
*/\r
public void removePcdData(String moduleKey, ModuleIdentification consumer) {\r
- try {\r
+ \r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)WorkspaceProfile.getModuleXmlObject(consumer);\r
if (msa.getPcdCoded() == null) {\r
return;\r
ModuleSADocument.ModuleSA moduleSA = getModuleSA(moduleKey);\r
if (moduleSA.getPcdBuildDefinition() != null) {\r
XmlCursor cursor = moduleSA.getPcdBuildDefinition().newCursor();\r
+ cursor.push();\r
if (cursor.toFirstChild()) {\r
do {\r
PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor\r
.getObject();\r
- if (msaPcd.getCName().equals(pcdData.getCName())\r
- && msaPcd.getTokenSpaceGuidCName().equals(pcdData.getTokenSpaceGuidCName())) {\r
+ String cName = msaPcd.getCName();\r
+ String tsGuidCName = msaPcd.getTokenSpaceGuidCName();\r
+ if (cName.equals(pcdData.getCName())\r
+ && tsGuidCName.equals(pcdData.getTokenSpaceGuidCName()) && !multiSourcePcd(cName, tsGuidCName, moduleKey)) {\r
\r
maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(),\r
moduleKey);\r
}\r
} while (cursor.toNextSibling());\r
}\r
+ \r
+ cursor.pop();\r
+ if (moduleSA.getPcdBuildDefinition().getPcdDataList().size() == 0) {\r
+ cursor.removeXml();\r
+ }\r
cursor.dispose();\r
}\r
}\r
- \r
- }\r
- catch (Exception e){\r
- e.printStackTrace();\r
- \r
- }\r
+ \r
}\r
//\r
// key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
cursor.toNextSibling();\r
}\r
cursor.push();\r
- cursor.toPrevToken();\r
+ while (cursor.hasPrevToken()) {\r
+ cursor.toPrevToken();\r
+ if (!cursor.isText()) {\r
+ break;\r
+ }\r
+ String s = cursor.getTextValue();\r
+ if (s.matches(regExpNewLineAndSpaces)) {\r
+ continue;\r
+ }\r
+ }\r
+ \r
if (cursor.isComment()) {\r
cursor.removeXml();\r
}\r
setFvBinding (moduleSa, newFvNameList.trim());\r
}\r
\r
- public void updateFvBindingInModuleSA (ModuleIdentification mi, String fvName) {\r
- Vector<Object> vSupArchs = new Vector<Object>();\r
- getPlatformDefsSupportedArchs(vSupArchs);\r
- String moduleInfo = mi.getGuid() + " " + mi.getVersion() + " " + mi.getPackageId().getGuid() + " " + mi.getPackageId().getVersion();\r
- for (int i = 0; i < vSupArchs.size(); ++i) {\r
- String moduleKey = moduleInfo + " " + vSupArchs.get(i);\r
- appendFvBinding (moduleKey, fvName);\r
- }\r
+ public void updateFvBindingInModuleSA (String moduleKey, String fvName) {\r
+ \r
+ appendFvBinding (moduleKey, fvName);\r
}\r
\r
public String getFfsFileNameGuid(String moduleKey){\r
pcdConsumer = new ArrayList<String>();\r
}\r
//\r
+ // Check whether this PCD has already added to ModuleSA, if so, just return.\r
+ //\r
+ String moduleInfo = moduleSa.getModuleGuid().toLowerCase() + " " + moduleSa.getModuleVersion() \r
+ + " " + moduleSa.getPackageGuid().toLowerCase() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList());\r
+ for (int i = 0; i < pcdConsumer.size(); ++i) {\r
+ String pcdInfo = pcdConsumer.get(i);\r
+ if (moduleInfo.equals(pcdInfo.substring(0, pcdInfo.lastIndexOf(" ")))){\r
+ return;\r
+ }\r
+ }\r
+ //\r
// Using existing Pcd type, if this pcd already exists in other ModuleSA\r
//\r
if (pcdConsumer.size() > 0) {\r
\r
itemType = itemType (pcdConsumer.get(0));\r
}\r
- String listValue = moduleSa.getModuleGuid() + " " + moduleSa.getModuleVersion() \r
- + " " + moduleSa.getPackageGuid() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList())\r
- + " " + itemType;\r
+ String listValue = moduleInfo + " " + itemType;\r
pcdConsumer.add(listValue);\r
dynPcdMap.put(cName + " " + tsGuid, pcdConsumer);\r
\r
for (int i = 0; i < includeModules.size(); ++i) {\r
cursor.beginElement(elementModule);\r
cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);\r
- cursor.insertAttributeWithValue("BaseName", includeModules.get(i)[1]);\r
+ if (!includeModules.get(i)[1].equals("null") && includeModules.get(i)[1].length() != 0) {\r
+ cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);\r
+ }\r
+ cursor.insertAttributeWithValue("PackageGuid", includeModules.get(i)[2]);\r
+ if (!includeModules.get(i)[3].equals("null") && includeModules.get(i)[3].length() != 0) {\r
+ cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);\r
+ }\r
+ \r
+ cursor.insertAttributeWithValue("Arch", includeModules.get(i)[4]);\r
cursor.toEndToken();\r
cursor.toNextToken();\r
}\r
QName elementFvName = new QName (xmlNs, "FvName");\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName attribModuleGuid = new QName("ModuleGuid");\r
- QName attribBaseName = new QName("BaseName");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
\r
if (cursor.toChild(elementUserExts)) {\r
do {\r
int i = 0;\r
do {\r
saa[i][0] = cursor.getAttributeText(attribModuleGuid);\r
- saa[i][1] = cursor.getAttributeText(attribBaseName);\r
+ saa[i][1] = cursor.getAttributeText(attribModuleVersion);\r
+ saa[i][2] = cursor.getAttributeText(attribPackageGuid);\r
+ saa[i][3] = cursor.getAttributeText(attribPackageVersion);\r
+ saa[i][4] = cursor.getAttributeText(attribArch);\r
++i;\r
}while (cursor.toNextSibling());\r
}\r
\r
}\r
\r
+ private boolean versionEqual (String v1, String v2) {\r
+ \r
+ if ((v1 == null || v1.length() == 0 || v1.equalsIgnoreCase("null")) \r
+ && (v2 == null || v2.length() == 0 || v2.equalsIgnoreCase("null"))) {\r
+ return true;\r
+ }\r
+ \r
+ if (v1 != null && v1.equals(v2)) {\r
+ return true;\r
+ }\r
+ \r
+ return false;\r
+ }\r
+ \r
+ public boolean moduleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ boolean inList = false;\r
+ if (getUserExtsIncModCount(fvName) > 0) {\r
+ \r
+ XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+ QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+ QName attribUserId = new QName ("UserID");\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName attribModuleGuid = new QName("ModuleGuid");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
+ \r
+ if (cursor.toChild(elementUserExts)) {\r
+ do {\r
+ cursor.push();\r
+ if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ cursor.toChild(elementFvName);\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(fvName)) {\r
+ cursor.toNextSibling(elementIncludeModules);\r
+ if (cursor.toFirstChild()) {\r
+ \r
+ do {\r
+ String mg = cursor.getAttributeText(attribModuleGuid);\r
+ String mv = cursor.getAttributeText(attribModuleVersion);\r
+ String pg = cursor.getAttributeText(attribPackageGuid);\r
+ String pv = cursor.getAttributeText(attribPackageVersion);\r
+ String ar = cursor.getAttributeText(attribArch);\r
+ if (!moduleGuid.equalsIgnoreCase(mg)) {\r
+ continue;\r
+ }\r
+ if (!packageGuid.equalsIgnoreCase(pg)) {\r
+ continue;\r
+ }\r
+ if (!arch.equalsIgnoreCase(ar)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(moduleVersion, mv)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(packageVersion, pv)) {\r
+ continue;\r
+ }\r
+ inList = true;\r
+ break;\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ cursor.pop();\r
+ }while (cursor.toNextSibling(elementUserExts));\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ return inList;\r
+ }\r
+ \r
+ public void removeModuleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ if (getUserExtsIncModCount(fvName) > 0) {\r
+ \r
+ XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+ QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+ QName attribUserId = new QName ("UserID");\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName attribModuleGuid = new QName("ModuleGuid");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
+ \r
+ if (cursor.toChild(elementUserExts)) {\r
+ do {\r
+ cursor.push();\r
+ if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ cursor.toChild(elementFvName);\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(fvName)) {\r
+ cursor.toNextSibling(elementIncludeModules);\r
+ if (cursor.toFirstChild()) {\r
+ \r
+ do {\r
+ String mg = cursor.getAttributeText(attribModuleGuid);\r
+ String mv = cursor.getAttributeText(attribModuleVersion);\r
+ String pg = cursor.getAttributeText(attribPackageGuid);\r
+ String pv = cursor.getAttributeText(attribPackageVersion);\r
+ String ar = cursor.getAttributeText(attribArch);\r
+ if (!moduleGuid.equalsIgnoreCase(mg)) {\r
+ continue;\r
+ }\r
+ if (!packageGuid.equalsIgnoreCase(pg)) {\r
+ continue;\r
+ }\r
+ if (!arch.equalsIgnoreCase(ar)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(moduleVersion, mv)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(packageVersion, pv)) {\r
+ continue;\r
+ }\r
+ cursor.removeXml();\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ cursor.pop();\r
+ }while (cursor.toNextSibling(elementUserExts));\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ }\r
\r
public void genBuildOptionsUserDefAntTask (String id, String fileName, String execOrder) {\r
UserDefinedAntTasksDocument.UserDefinedAntTasks udats = getfpdBuildOpts().getUserDefinedAntTasks();\r
projects / mirror_edk2.git / blobdiff