import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
+import org.tianocore.frameworkwizard.workspace.Workspace;\r
\r
/**\r
This class processes fpd file contents such as add remove xml elements. \r
cursor.dispose();\r
}\r
\r
- public boolean adjustPcd (int seqModuleSa) throws Exception {\r
+ public boolean adjustPcd (int seqModuleSa, Vector<String> vExceptions) throws Exception {\r
boolean dataModified = false;\r
ModuleSADocument.ModuleSA moduleSa = getModuleSA(seqModuleSa);\r
int pcdCount = getPcdDataCount(seqModuleSa);\r
String[][] saaLib = new String[libCount][5];\r
getLibraryInstances(moduleKey, saaLib);\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
+ if (mi == null) {\r
+ vExceptions.add("Module " + mg + " does NOT exist in workspace.");\r
+ throw new Exception ("Module does NOT exist in workspace.");\r
+ }\r
Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
//\r
// create vector for module & library instance MIs.\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
+ if (libMi != null) {\r
+ vMi.add(libMi);\r
+ }\r
}\r
\r
nextPcd:for (int i = 0; i < saaModuleSaPcd.length; ++i) {\r
\r
for (int j = 0; j < vMi.size(); ++j) {\r
ModuleIdentification nextMi = vMi.get(j);\r
- if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\r
+ if (nextMi == null) {\r
+ continue;\r
+ }\r
+ if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], arch, nextMi)) {\r
continue nextPcd;\r
}\r
}\r
}\r
}\r
}\r
+ // Check sup arch conformance for the new PCD\r
+ if (msaPcd.getSupArchList() != null) {\r
+ String newPcdArch = msaPcd.getSupArchList().toString();\r
+ if (!newPcdArch.toLowerCase().contains(arch.toLowerCase())) {\r
+ continue;\r
+ }\r
+ }\r
\r
PackageIdentification[] depPkgs = SurfaceAreaQuery.getDependencePkg(null, vMi.get(i));\r
PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
//\r
// ToDo Error \r
//\r
- throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module "\r
- + mi.getName());\r
+ String errorMessage = "No Declaration for PCD Entry " + msaPcd.getCName() + " in Module "\r
+ + mi.getName();\r
+ if (i != 0) {\r
+ errorMessage += " Library Instance " + vMi.get(i).getName(); \r
+ }\r
+ vExceptions.add(errorMessage);\r
+ throw new PcdDeclNotFound(errorMessage);\r
}\r
//\r
// AddItem to ModuleSA PcdBuildDefinitions\r
\r
int pcdSourceCount = 0;\r
for (int i = 0; i < vMi.size(); ++i) {\r
- if (WorkspaceProfile.pcdInMsa(cName, tsGuidCName, vMi.get(i))) {\r
+ if (WorkspaceProfile.pcdInMsa(cName, tsGuidCName, null, vMi.get(i))) {\r
pcdSourceCount++;\r
}\r
}\r
XmlCursor cursor = instance.newCursor();\r
try{\r
String comment = "Pkg: " + pn + " Mod: " + mn \r
- + " Path: " + libMi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ + " Path: " + libMi.getPath().substring(Workspace.getCurrentWorkspace().length() + 1);\r
cursor.insertComment(comment);\r
}\r
catch (Exception e){\r
ListIterator li = l.listIterator();\r
while (li.hasNext()) {\r
PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry) li.next();\r
+ if (msaPcd.getSupArchList() != null) {\r
+ if (!msaPcd.getSupArchList().toString().toLowerCase().contains(arch.toLowerCase())) {\r
+ continue;\r
+ }\r
+ }\r
PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
if (spdPcd == null) {\r
//\r
// ToDo Error \r
//\r
- throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module "\r
- + mi.getName());\r
+ throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + "\n used by Module "\r
+ + mi.getName() + " or its Library Instances.");\r
}\r
//\r
// AddItem to ModuleSA PcdBuildDefinitions\r
XmlCursor cursor = msa.newCursor();\r
try{\r
String comment = "Mod: " + mi.getName() + " Type: " + SurfaceAreaQuery.getModuleType(mi) + " Path: "\r
- + mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ + mi.getPath().substring(Workspace.getCurrentWorkspace().length() + 1);\r
cursor.insertComment(comment);\r
}\r
catch(Exception e){\r
fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r
\r
- if (defaultVal != null){\r
+ if (defaultVal != null && defaultVal.length() > 0){\r
fpdPcd.setValue(defaultVal);\r
}\r
else {\r
fpdPcd.setValue("FALSE");\r
}\r
if (dataType.equals("VOID*")) {\r
- fpdPcd.setValue("");\r
+ fpdPcd.setValue("L\"\"");\r
}\r
}\r
//\r
saa[i][1] = dynPcd.getToken().toString();\r
saa[i][2] = dynPcd.getTokenSpaceGuidCName();\r
saa[i][3] = dynPcd.getMaxDatumSize()+"";\r
- saa[i][4] = dynPcd.getDatumType().toString();\r
+ saa[i][4] = dynPcd.getDatumType()+"";\r
\r
++i;\r
}\r
return;\r
}\r
else {\r
- QName qSkuInfo = new QName(xmlNs, "SkuInfo");\r
- cursor.toChild(qSkuInfo);\r
- cursor.removeXml();\r
+ pcdData.getSkuInfoList().clear();\r
+// QName qSkuInfo = new QName(xmlNs, "SkuInfo");\r
+// cursor.toChild(qSkuInfo);\r
+// cursor.removeXml();\r
}\r
}\r
cursor.dispose();\r
return fpdBuildOpts;\r
}\r
\r
- public void genBuildOptionsUserExtensions(String fvName, String outputFileName, Vector<String[]> includeModules) {\r
+ public void genBuildOptionsUserExtensions(String fvName, String userId, String id, String outputFileName, Vector<String[]> includeModules) {\r
QName elementFvName = new QName (xmlNs, "FvName");\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName elementInfFileName = new QName(xmlNs, "InfFileName");\r
QName elementModule = new QName(xmlNs, "Module");\r
\r
UserExtensionsDocument.UserExtensions userExts = getfpdBuildOpts().addNewUserExtensions();\r
- userExts.setUserID("IMAGES");\r
- userExts.setIdentifier(new BigInteger("1"));\r
+ userExts.setUserID(userId);\r
+ userExts.setIdentifier(id);\r
XmlCursor cursor = userExts.newCursor();\r
cursor.toEndToken();\r
\r
cursor.toNextToken();\r
\r
cursor.beginElement(elementInfFileName);\r
- cursor.insertChars(fvName + ".inf");\r
+ cursor.insertChars(outputFileName);\r
cursor.toNextToken();\r
\r
cursor.beginElement(elementIncludeModules);\r
cursor.dispose();\r
}\r
\r
- public int getUserExtsIncModCount (String fvName) {\r
+ public int getUserExtsIncModCount (String fvName, String userId, int id) {\r
if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
return -1;\r
}\r
+\r
ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
while (li.hasNext()) {\r
UserExtensionsDocument.UserExtensions ues = li.next();\r
- if (!ues.getUserID().equals("IMAGES")) {\r
+ if (!ues.getUserID().equals(userId)) {\r
+ continue;\r
+ }\r
+ if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
continue;\r
}\r
XmlCursor cursor = ues.newCursor();\r
return -1;\r
}\r
\r
- public void getUserExtsIncMods(String fvName, String[][] saa) {\r
+ public void getUserExtsIncMods(String fvName, String userId, int id, String[][] saa) {\r
if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
return;\r
}\r
- \r
+\r
XmlCursor cursor = getfpdBuildOpts().newCursor();\r
QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
QName attribUserId = new QName ("UserID");\r
+ QName attribId = new QName ("Identifier");\r
QName elementFvName = new QName (xmlNs, "FvName");\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName attribModuleGuid = new QName("ModuleGuid");\r
if (cursor.toChild(elementUserExts)) {\r
do {\r
cursor.push();\r
- if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
cursor.toChild(elementFvName);\r
String elementName = cursor.getTextValue();\r
if (elementName.equals(fvName)) {\r
\r
}\r
\r
- public void removeBuildOptionsUserExtensions (String fvName) {\r
+ public void removeBuildOptionsUserExtensions (String fvName, String userId, int id) {\r
if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
return;\r
}\r
- \r
+\r
ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
while (li.hasNext()) {\r
UserExtensionsDocument.UserExtensions ues = li.next();\r
- if (!ues.getUserID().equals("IMAGES")) {\r
+ if (!ues.getUserID().equals(userId)) {\r
+ continue;\r
+ }\r
+ if (ues.getIdentifier()== null || ues.getIdentifier() != new Integer(id).toString()) {\r
continue;\r
}\r
XmlCursor cursor = ues.newCursor();\r
return false;\r
}\r
\r
- public boolean moduleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ public boolean moduleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
boolean inList = false;\r
- if (getUserExtsIncModCount(fvName) > 0) {\r
- \r
+ if (getUserExtsIncModCount(fvName, userId, id) > 0) {\r
XmlCursor cursor = getfpdBuildOpts().newCursor();\r
QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
QName attribUserId = new QName ("UserID");\r
+ QName attribId = new QName ("Identifier");\r
QName elementFvName = new QName (xmlNs, "FvName");\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName attribModuleGuid = new QName("ModuleGuid");\r
if (cursor.toChild(elementUserExts)) {\r
do {\r
cursor.push();\r
- if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
cursor.toChild(elementFvName);\r
String elementName = cursor.getTextValue();\r
if (elementName.equals(fvName)) {\r
return inList;\r
}\r
\r
- public void removeModuleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ public void removeModuleInBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
//\r
// if there is only one module before remove operation, the whole user extension should be removed.\r
//\r
- int moduleAmount = getUserExtsIncModCount(fvName);\r
+ int moduleAmount = getUserExtsIncModCount(fvName, userId, id);\r
if (moduleAmount == 1) {\r
- removeBuildOptionsUserExtensions(fvName);\r
+ removeBuildOptionsUserExtensions(fvName, userId, id);\r
return;\r
}\r
\r
if (moduleAmount > 1) {\r
- \r
XmlCursor cursor = getfpdBuildOpts().newCursor();\r
QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
QName attribUserId = new QName ("UserID");\r
+ QName attribId = new QName ("Identifier");\r
QName elementFvName = new QName (xmlNs, "FvName");\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName attribModuleGuid = new QName("ModuleGuid");\r
if (cursor.toChild(elementUserExts)) {\r
do {\r
cursor.push();\r
- if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ if (cursor.getAttributeText(attribUserId).equals(userId) && cursor.getAttributeText(attribId).equals(id+"")) {\r
cursor.toChild(elementFvName);\r
String elementName = cursor.getTextValue();\r
if (elementName.equals(fvName)) {\r
}\r
}\r
\r
- public void addModuleIntoBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
- if (moduleInBuildOptionsUserExtensions (fvName, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
+ public void addModuleIntoBuildOptionsUserExtensions (String fvName, String userId, int id, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ if (moduleInBuildOptionsUserExtensions (fvName, userId, id, moduleGuid, moduleVersion, packageGuid, packageVersion, arch)) {\r
return;\r
}\r
+\r
ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
QName elementModule = new QName(xmlNs, "Module");\r
while (li.hasNext()) {\r
UserExtensionsDocument.UserExtensions ues = li.next();\r
- if (!ues.getUserID().equals("IMAGES")) {\r
+ if (!ues.getUserID().equals(userId)) {\r
+ continue;\r
+ }\r
+ if (ues.getIdentifier() == null || ues.getIdentifier() != new Integer(id).toString()) {\r
continue;\r
}\r
XmlCursor cursor = ues.newCursor();\r
}\r
\r
public void updateBuildOptionsFfsSectionsType(int i, String type) {\r
- BuildOptionsDocument.BuildOptions.Ffs ffs = getfpdBuildOpts().addNewFfs();\r
- if (type != null) {\r
- ffs.addNewSections().setEncapsulationType(type);\r
- }\r
+ BuildOptionsDocument.BuildOptions.Ffs ffs = getFfs(i);\r
+ ffs.getSections().setEncapsulationType(type);\r
}\r
\r
public void genBuildOptionsFfsAttribute(int i, String name, String value) {\r
PcdItemTypeConflictException (String pcdName, String info) {\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(info);\r
if (mi != null) {\r
- details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackageId().getName(); \r
+ details = pcdName + " ItemType Conflicts with " + mi.getName() + "\n in Pkg " + mi.getPackageId().getName(); \r
}\r
else {\r
- details = pcdName + " ItemType Conflicts with " + info;\r
+ details = pcdName + " ItemType Conflicts with \n" + info;\r
}\r
}\r
\r
moduleInfo2 = info2;\r
}\r
\r
- details = pcdName + " ItemType Conflicts in " + moduleInfo1 + " and " + moduleInfo2;\r
+ details = pcdName + " ItemType Conflicts in \n" + moduleInfo1 + "\n and " + moduleInfo2;\r
}\r
\r
public String getMessage() {\r