import org.tianocore.IntermediateOutputType;\r
import org.tianocore.LibrariesDocument;\r
import org.tianocore.ModuleSADocument;\r
+import org.tianocore.ModuleSaBuildOptionsDocument;\r
import org.tianocore.ModuleSurfaceAreaDocument;\r
import org.tianocore.OptionDocument;\r
import org.tianocore.OptionsDocument;\r
\r
private DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions fpdDynPcdBuildDefs = null;\r
\r
- public static HashMap<String, ArrayList<String>> dynPcdMap = null;\r
+ private HashMap<String, ArrayList<String>> dynPcdMap = null;\r
\r
/**\r
* look through all pcd data in all ModuleSA, create pcd -> ModuleSA mappings.\r
dynPcdMap = new HashMap<String, ArrayList<String>>();\r
List<ModuleSADocument.ModuleSA> l = getfpdFrameworkModules().getModuleSAList();\r
if (l == null) {\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
return;\r
}\r
ListIterator<ModuleSADocument.ModuleSA> li = l.listIterator();\r
continue;\r
}\r
String ModuleInfo = msa.getModuleGuid() + " " + msa.getModuleVersion() +\r
- " " + msa.getPackageGuid() + " " + msa.getPackageVersion();\r
+ " " + msa.getPackageGuid() + " " + msa.getPackageVersion() + " " + listToString(msa.getSupArchList());\r
List<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> lp = msa.getPcdBuildDefinition().getPcdDataList();\r
ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> lpi = lp.listIterator();\r
while (lpi.hasNext()) {\r
}\r
}\r
}\r
+ \r
+ public ArrayList<String> getDynPcdMapValue(String key) {\r
+ return dynPcdMap.get(key);\r
+ }\r
/**\r
Constructor to create a new spd file\r
**/\r
}\r
\r
public int getFrameworkModulesCount() {\r
- if (getfpdFrameworkModules().getModuleSAList() == null){\r
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
return 0;\r
}\r
return getfpdFrameworkModules().getModuleSAList().size();\r
int i = 0;\r
while(li.hasNext()) {\r
ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();\r
- saa[i][1] = msa.getModuleGuid();\r
- saa[i][2] = msa.getModuleVersion();\r
+ saa[i][0] = msa.getModuleGuid();\r
+ saa[i][1] = msa.getModuleVersion();\r
\r
- saa[i][3] = msa.getPackageGuid();\r
- saa[i][4] = msa.getPackageVersion();\r
-// saa[i][4] = listToString(msa.getSupArchList());\r
+ saa[i][2] = msa.getPackageGuid();\r
+ saa[i][3] = msa.getPackageVersion();\r
+ saa[i][4] = listToString(msa.getSupArchList());\r
++i;\r
}\r
}\r
\r
+ public void getFrameworkModuleInfo(int i, String[] sa) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
+ if (msa == null) {\r
+ return;\r
+ }\r
+ sa[0] = msa.getModuleGuid();\r
+ sa[1] = msa.getModuleVersion();\r
+ sa[2] = msa.getPackageGuid();\r
+ sa[3] = msa.getPackageVersion();\r
+ sa[4] = listToString(msa.getSupArchList());\r
+ }\r
+ \r
public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
String[] s = key.split(" ");\r
- if (getfpdFrameworkModules().getModuleSAList() == null) {\r
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
return null;\r
}\r
ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
while(li.hasNext()) {\r
ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();\r
- if (msa.getModuleGuid().equals(s[0]) && msa.getModuleVersion().equals(s[1])\r
- && msa.getPackageGuid().equals(s[2]) && msa.getPackageVersion().equals(s[3])) {\r
- \r
+ if (msa.getModuleGuid().equalsIgnoreCase(s[0]) && msa.getPackageGuid().equalsIgnoreCase(s[2])) {\r
+ if (msa.getModuleVersion() != null) {\r
+ if (!msa.getModuleVersion().equals(s[1])) {\r
+ continue;\r
+ }\r
+ }\r
+ if (msa.getPackageVersion() != null) {\r
+ if (!msa.getPackageVersion().equals(s[3])) {\r
+ continue;\r
+ }\r
+ }\r
+ //ToDo add arch check for s[4]\r
+ if (msa.getSupArchList() != null) {\r
+ if (!listToString(msa.getSupArchList()).equals(s[4])) {\r
+ continue;\r
+ }\r
+ }\r
return msa;\r
}\r
}\r
return null;\r
}\r
+ \r
+ private ModuleSADocument.ModuleSA getModuleSA(int i) {\r
+ ModuleSADocument.ModuleSA msa = null;\r
+ if (fpdRoot.getFrameworkModules() == null) {\r
+ return null;\r
+ }\r
+ XmlCursor cursor = fpdRoot.getFrameworkModules().newCursor();\r
+ if (cursor.toFirstChild()) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling();\r
+ }\r
+ msa = (ModuleSADocument.ModuleSA)cursor.getObject();\r
+ }\r
+ cursor.dispose();\r
+ return msa;\r
+ }\r
+ \r
public void removeModuleSA(int i) {\r
- XmlObject o = getfpdFrameworkModules();\r
+ XmlObject o = fpdRoot.getFrameworkModules();\r
if (o == null) {\r
return;\r
}\r
//\r
ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)cursor.getObject();\r
String moduleInfo = moduleSa.getModuleGuid() + " " + moduleSa.getModuleVersion() + " " +\r
- moduleSa.getPackageGuid()+ " " + moduleSa.getPackageVersion();\r
+ moduleSa.getPackageGuid()+ " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList());\r
PcdBuildDefinitionDocument.PcdBuildDefinition pcdBuildDef = moduleSa.getPcdBuildDefinition();\r
- if (pcdBuildDef != null) {\r
- maintainDynPcdMap(pcdBuildDef, moduleInfo);\r
+ if (pcdBuildDef != null && pcdBuildDef.getPcdDataList() != null) {\r
+ ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> li = pcdBuildDef.getPcdDataList().listIterator();\r
+ while(li.hasNext()) {\r
+ PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = li.next();\r
+ maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(), moduleInfo);\r
+ }\r
+ }\r
+ \r
+ cursor.push();\r
+ cursor.toPrevToken();\r
+ if (cursor.isComment()) {\r
+ cursor.removeXml();\r
}\r
+ cursor.pop();\r
cursor.removeXml();\r
+ if (getFrameworkModulesCount() == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
}\r
cursor.dispose();\r
}\r
\r
- private void maintainDynPcdMap(PcdBuildDefinitionDocument.PcdBuildDefinition o, String moduleInfo) {\r
- XmlCursor cursor = o.newCursor();\r
- boolean fromLibInstance = false;\r
- if (!cursor.toFirstChild()){\r
+ private void maintainDynPcdMap(String pcdKey, String moduleInfo) {\r
+ \r
+ ArrayList<String> al = dynPcdMap.get(pcdKey);\r
+ if (al == null) {\r
return;\r
}\r
- //\r
- // deal with first child, same process in the while loop below for siblings.\r
- //\r
- PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
- String pcdKey = pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName();\r
- ArrayList<String> al = dynPcdMap.get(pcdKey);\r
+ String[] s = moduleInfo.split(" ");\r
for(int i = 0; i < al.size(); ++i){\r
- if (al.get(i).startsWith(moduleInfo)){\r
- fromLibInstance = true;\r
+ String consumer = al.get(i);\r
+ if (consumer.contains(s[0]) && consumer.contains(s[2])){\r
+ String[] consumerPart = consumer.split(" ");\r
+ if (!consumerPart[4].equals(s[4])) {\r
+ continue;\r
+ }\r
+ al.remove(consumer);\r
break;\r
}\r
}\r
- al.remove(moduleInfo + " " + pcdData.getItemType().toString());\r
+\r
if (al.size() == 0) {\r
dynPcdMap.remove(pcdKey);\r
+ String[] s1 = pcdKey.split(" ");\r
+ removeDynamicPcdBuildData(s1[0], s1[1]);\r
}\r
\r
- if (pcdData.getItemType().toString().equals("DYNAMIC")) {\r
- if (dynPcdMap.get(pcdKey) == null) {\r
- removeDynamicPcdBuildData(pcdData.getCName(), pcdData.getTokenSpaceGuidCName());\r
- }\r
+ }\r
+ //\r
+ // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
+ //\r
+ public int getPcdDataCount(int i){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
+ \r
+ if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
+ return 0;\r
}\r
- if (fromLibInstance){\r
- cursor.removeXml();\r
+ return msa.getPcdBuildDefinition().getPcdDataList().size();\r
+ \r
+ }\r
+ \r
+ public void getPcdData(int i, String[][] saa) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
+ \r
+ if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
+ return;\r
}\r
- while(cursor.toNextSibling()) {\r
- fromLibInstance = false;\r
- pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
- //\r
- // remove each pcd record from dynPcdMap\r
- //\r
- pcdKey = pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName();\r
- al = dynPcdMap.get(pcdKey);\r
- for(int i = 0; i < al.size(); ++i){\r
- if (al.get(i).startsWith(moduleInfo)){\r
- fromLibInstance = true;\r
+ ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData>li = msa.getPcdBuildDefinition().getPcdDataList().listIterator();\r
+ for (int k = 0; k < saa.length; ++k) {\r
+ PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = li.next();\r
+ saa[k][0] = pcdData.getCName();\r
+ saa[k][1] = pcdData.getTokenSpaceGuidCName();\r
+ saa[k][2] = pcdData.getItemType()+"";\r
+ saa[k][3] = pcdData.getToken().toString();\r
+ saa[k][4] = pcdData.getMaxDatumSize()+"";\r
+ saa[k][5] = pcdData.getDatumType()+"";\r
+ saa[k][6] = pcdData.getValue();\r
+ \r
+ }\r
+ }\r
+ \r
+ public void updatePcdData(String key, String cName, String tsGuid, String itemType, String maxSize, String value){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
+ if (msa == null || msa.getPcdBuildDefinition() == null){\r
+ return;\r
+ }\r
+ \r
+ XmlCursor cursor = msa.getPcdBuildDefinition().newCursor();\r
+ if (cursor.toFirstChild()){\r
+ do {\r
+ PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
+ if (pcdData.getCName().equals(cName) && pcdData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+ pcdData.setItemType(PcdItemTypes.Enum.forString(itemType));\r
+ if(pcdData.getDatumType().equals("VOID*")) {\r
+ pcdData.setMaxDatumSize(new Integer(maxSize));\r
+ }\r
+ pcdData.setValue(value);\r
break;\r
}\r
}\r
- al.remove(moduleInfo + " " + pcdData.getItemType().toString());\r
- if (al.size() == 0) {\r
- dynPcdMap.remove(pcdKey);\r
+ while(cursor.toNextSibling());\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ /**Get original Pcd info from MSA & SPD files.\r
+ * @param mi ModuleIdentification from which MSA & SPD come\r
+ * @param cName PCD cName\r
+ * @param sa Results: HelpText, Original item type.\r
+ * @return\r
+ */\r
+ public boolean getPcdBuildDataInfo(ModuleIdentification mi, String cName, String[] sa) throws Exception{\r
+ try {\r
+ \r
+ ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)GlobalData.getModuleXmlObject(mi);\r
+ if (msa.getPcdCoded() == null) {\r
+ return false;\r
}\r
\r
- if (pcdData.getItemType().toString().equals("DYNAMIC")) {\r
- //\r
- // First check whether this is the only consumer of this dyn pcd.\r
- //\r
- if (dynPcdMap.get(pcdKey) == null) {\r
+ Map<String, XmlObject> m = new HashMap<String, XmlObject>();\r
+ m.put("ModuleSurfaceArea", msa);\r
+ SurfaceAreaQuery.setDoc(m);\r
+ PackageIdentification[] depPkgs = SurfaceAreaQuery.getDependencePkg(null);\r
+ //\r
+ // First look through MSA pcd entries.\r
+ //\r
+ List<PcdCodedDocument.PcdCoded.PcdEntry> l = msa.getPcdCoded().getPcdEntryList();\r
+ ListIterator li = l.listIterator();\r
+ while(li.hasNext()) {\r
+ PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry)li.next();\r
+ if (!msaPcd.getCName().equals(cName)) {\r
+ continue;\r
+ }\r
+ PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
+ if (spdPcd == null) {\r
//\r
- // delete corresponding entry in DynamicPcdBuildData\r
+ // ToDo Error \r
//\r
- removeDynamicPcdBuildData(pcdData.getCName(), pcdData.getTokenSpaceGuidCName());\r
+ throw new PcdDeclNotFound(mi.getName() + " " + msaPcd.getCName());\r
}\r
+ //\r
+ // Get Pcd help text and original item type.\r
+ //\r
+ sa[0] = spdPcd.getHelpText() + msaPcd.getHelpText();\r
+ sa[1] = msaPcd.getPcdItemType()+"";\r
+ return true;\r
}\r
- if (fromLibInstance){\r
- cursor.removeXml();\r
- }\r
+ \r
+ \r
}\r
- }\r
- //\r
- // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer"\r
- //\r
- public int getPcdDataCount(String key){\r
- ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
- if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
- return 0;\r
+ catch (Exception e){\r
+ e.printStackTrace();\r
+ throw e;\r
}\r
- return msa.getPcdBuildDefinition().getPcdDataList().size();\r
+ \r
+ return false;\r
}\r
\r
- public void getPcdData(String key, String[][] saa) {\r
- ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
- if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
- return;\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
+ ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)GlobalData.getModuleXmlObject(consumer);\r
+ if (msa.getPcdCoded() == null) {\r
+ return;\r
+ }\r
+ \r
+ List<PcdCodedDocument.PcdCoded.PcdEntry> l = msa.getPcdCoded().getPcdEntryList();\r
+ ListIterator li = l.listIterator();\r
+ \r
+ while(li.hasNext()) {\r
+ PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry)li.next();\r
+ ModuleSADocument.ModuleSA moduleSA = getModuleSA(moduleKey);\r
+ if (moduleSA.getPcdBuildDefinition() != null) {\r
+ XmlCursor cursor = moduleSA.getPcdBuildDefinition().newCursor();\r
+ if (cursor.toFirstChild()) {\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
+\r
+ maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(), moduleKey);\r
+ cursor.removeXml();\r
+ break;\r
+ }\r
+ while (cursor.toNextSibling()) {\r
+ pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor.getObject();\r
+ if (msaPcd.getCName().equals(pcdData.getCName())\r
+ && msaPcd.getTokenSpaceGuidCName().equals(pcdData.getTokenSpaceGuidCName())) {\r
+ maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(),\r
+ moduleKey);\r
+ cursor.removeXml();\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ }\r
+ \r
}\r
- ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData>li = msa.getPcdBuildDefinition().getPcdDataList().listIterator();\r
- for (int i = 0; i < saa.length; ++i) {\r
- PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = li.next();\r
- saa[i][0] = pcdData.getCName();\r
- saa[i][1] = pcdData.getTokenSpaceGuidCName();\r
- saa[i][2] = pcdData.getItemType().toString();\r
- saa[i][3] = pcdData.getToken().toString();\r
- saa[i][4] = pcdData.getDatumType().toString();\r
- saa[i][5] = pcdData.getValue();\r
+ catch (Exception e){\r
+ e.printStackTrace();\r
\r
}\r
}\r
//\r
- // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer"\r
+ // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
//\r
public int getLibraryInstancesCount(String key) {\r
ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
}\r
}\r
\r
- public void removeLibraryInstances(String key) {\r
+ public void removeLibraryInstance(String key, int i) {\r
ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
if (msa == null || msa.getLibraries() == null){\r
return ;\r
}\r
\r
XmlCursor cursor = msa.getLibraries().newCursor();\r
- cursor.removeXml();\r
+ if (cursor.toFirstChild()) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling();\r
+ }\r
+ cursor.push();\r
+ cursor.toPrevToken();\r
+ if (cursor.isComment()) {\r
+ cursor.removeXml();\r
+ }\r
+ cursor.pop();\r
+ cursor.removeXml();\r
+ if (getLibraryInstancesCount(key) == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
+ }\r
+ \r
cursor.dispose();\r
}\r
\r
- public void genLibraryInstance(String mg, String mv, String pg, String pv, String key) {\r
+ public void genLibraryInstance(ModuleIdentification libMi, String key) {\r
ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
if (msa == null){\r
msa = getfpdFrameworkModules().addNewModuleSA();\r
libs = msa.addNewLibraries();\r
}\r
\r
+ String mn = libMi.getName();\r
+ String mg = libMi.getGuid();\r
+ String mv = libMi.getVersion();\r
+ String pn = libMi.getPackage().getName();\r
+ String pg = libMi.getPackage().getGuid();\r
+ String pv = libMi.getPackage().getVersion();\r
LibrariesDocument.Libraries.Instance instance = libs.addNewInstance();\r
+ XmlCursor cursor = instance.newCursor();\r
+ try{\r
+ String comment = "Pkg: " + pn + " Mod: " + mn \r
+ + " Path: " + GlobalData.getMsaFile(libMi).getPath();\r
+ cursor.insertComment(comment);\r
+ }\r
+ catch (Exception e){\r
+ e.printStackTrace();\r
+ }\r
+ finally {\r
+ cursor.dispose();\r
+ }\r
+ \r
instance.setModuleGuid(mg);\r
instance.setModuleVersion(mv);\r
instance.setPackageGuid(pg);\r
instance.setPackageVersion(pv);\r
\r
}\r
+ \r
+ public String getFvBinding(String moduleKey){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+ return null;\r
+ }\r
+ return msa.getModuleSaBuildOptions().getFvBinding();\r
+ }\r
+ \r
+ public void setFvBinding(String moduleKey, String fvBinding){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null ) {\r
+ return;\r
+ }\r
+ if(msa.getModuleSaBuildOptions() == null){\r
+ msa.addNewModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ return;\r
+ }\r
+ msa.getModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ }\r
+ \r
+ public String getFfsFileNameGuid(String moduleKey){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+ return null;\r
+ }\r
+ return msa.getModuleSaBuildOptions().getFfsFileNameGuid();\r
+ }\r
+ \r
+ public void setFfsFileNameGuid(String moduleKey, String fileGuid){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null ) {\r
+ return;\r
+ }\r
+ if(msa.getModuleSaBuildOptions() == null){\r
+ msa.addNewModuleSaBuildOptions();\r
+ \r
+ }\r
+ ModuleSaBuildOptionsDocument.ModuleSaBuildOptions msaBuildOpts= msa.getModuleSaBuildOptions();\r
+ if (fileGuid != null) {\r
+ msaBuildOpts.setFfsFileNameGuid(fileGuid);\r
+ }\r
+ else{\r
+ XmlCursor cursor = msaBuildOpts.newCursor();\r
+ if (cursor.toChild(xmlNs, "FfsFileNameGuid")) {\r
+ cursor.removeXml();\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ }\r
+ \r
+ public String getFfsFormatKey(String moduleKey){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+ return null;\r
+ }\r
+ return msa.getModuleSaBuildOptions().getFfsFormatKey();\r
+ }\r
+ \r
+ public void setFfsFormatKey(String moduleKey, String ffsKey){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null ) {\r
+ return;\r
+ }\r
+ if(msa.getModuleSaBuildOptions() == null){\r
+ msa.addNewModuleSaBuildOptions().setFfsFormatKey(ffsKey);\r
+ return;\r
+ }\r
+ msa.getModuleSaBuildOptions().setFfsFormatKey(ffsKey);\r
+ }\r
+ \r
+ public void getModuleSAOptions(String moduleKey, String[][] saa) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+ || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
+ return ;\r
+ }\r
+ \r
+ List<OptionDocument.Option> lOpt = msa.getModuleSaBuildOptions().getOptions().getOptionList();\r
+ ListIterator li = lOpt.listIterator();\r
+ int i = 0;\r
+ while(li.hasNext()) {\r
+ OptionDocument.Option opt = (OptionDocument.Option)li.next();\r
+ if (opt.getBuildTargets() != null) {\r
+ saa[i][0] = listToString(opt.getBuildTargets());\r
+ }\r
+ saa[i][1] = opt.getToolChainFamily();\r
+ saa[i][2] = opt.getTagName();\r
+ saa[i][3] = opt.getToolCode();\r
+ \r
+ if (opt.getSupArchList() != null){\r
+ saa[i][4] = listToString(opt.getSupArchList());\r
+\r
+ }\r
+ \r
+ saa[i][5] = opt.getStringValue();\r
+ \r
+ ++i;\r
+ }\r
+ }\r
+ \r
+ public int getModuleSAOptionsCount(String moduleKey){\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+ || msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
+ return 0;\r
+ }\r
+ return msa.getModuleSaBuildOptions().getOptions().getOptionList().size();\r
+ }\r
+ \r
+ public void genModuleSAOptionsOpt(String moduleKey, Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa.getModuleSaBuildOptions() == null) {\r
+ msa.addNewModuleSaBuildOptions();\r
+ }\r
+ if (msa.getModuleSaBuildOptions().getOptions() == null){\r
+ msa.getModuleSaBuildOptions().addNewOptions();\r
+ }\r
+ OptionDocument.Option opt = msa.getModuleSaBuildOptions().getOptions().addNewOption();\r
+ setBuildOptionsOpt(buildTargets, toolChain, tagName, toolCmd, archList, contents, opt);\r
+ }\r
+ \r
+ public void removeModuleSAOptionsOpt(String moduleKey, int i) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null) {\r
+ return ;\r
+ }\r
+ OptionsDocument.Options opts = msa.getModuleSaBuildOptions().getOptions();\r
+ XmlCursor cursor = opts.newCursor();\r
+ if (cursor.toFirstChild()) {\r
+ for (int j = 0; j < i; ++j){\r
+ cursor.toNextSibling();\r
+ }\r
+ cursor.removeXml();\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ public void updateModuleSAOptionsOpt(String moduleKey, int i, Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents) {\r
+ ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
+ if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null) {\r
+ return ;\r
+ }\r
+ OptionsDocument.Options opts = msa.getModuleSaBuildOptions().getOptions();\r
+ XmlCursor cursor = opts.newCursor();\r
+ if (cursor.toFirstChild()) {\r
+ for (int j = 0; j < i; ++j){\r
+ cursor.toNextSibling();\r
+ }\r
+ OptionDocument.Option opt = (OptionDocument.Option)cursor.getObject();\r
+ setBuildOptionsOpt(buildTargets, toolChain, tagName, toolCmd, archList, contents, opt);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
/**add pcd information of module mi to a ModuleSA. \r
* @param mi\r
* @param moduleSa if null, generate a new ModuleSA.\r
*/\r
- public void addFrameworkModulesPcdBuildDefs(ModuleIdentification mi, ModuleSADocument.ModuleSA moduleSa){\r
+ public void addFrameworkModulesPcdBuildDefs(ModuleIdentification mi, String arch, ModuleSADocument.ModuleSA moduleSa) throws Exception {\r
//ToDo add Arch filter\r
\r
try {\r
+ if (moduleSa == null) {\r
+ moduleSa = genModuleSA(mi, arch);\r
+ }\r
+ \r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)GlobalData.getModuleXmlObject(mi);\r
if (msa.getPcdCoded() == null) {\r
return;\r
}\r
- if (moduleSa == null) {\r
- moduleSa = genModuleSA(mi);\r
- }\r
+ \r
Map<String, XmlObject> m = new HashMap<String, XmlObject>();\r
m.put("ModuleSurfaceArea", msa);\r
SurfaceAreaQuery.setDoc(m);\r
//\r
// ToDo Error \r
//\r
- break;\r
+ throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module " + mi.getName());\r
}\r
//\r
// AddItem to ModuleSA PcdBuildDefinitions\r
//\r
String defaultVal = msaPcd.getDefaultValue() == null ? spdPcd.getDefaultValue() : msaPcd.getDefaultValue();\r
+ \r
genPcdData(msaPcd.getCName(), spdPcd.getToken(), msaPcd.getTokenSpaceGuidCName(), msaPcd.getPcdItemType().toString(), spdPcd.getDatumType()+"", defaultVal, moduleSa);\r
}\r
\r
}\r
catch (Exception e){\r
- e.printStackTrace();\r
+ \r
+ throw e; \r
}\r
\r
}\r
return null;\r
}\r
\r
- private ModuleSADocument.ModuleSA genModuleSA (ModuleIdentification mi) {\r
+ private ModuleSADocument.ModuleSA genModuleSA (ModuleIdentification mi, String arch) {\r
PackageIdentification pi = GlobalData.getPackageForModule(mi);\r
ModuleSADocument.ModuleSA msa = getfpdFrameworkModules().addNewModuleSA();\r
+ XmlCursor cursor = msa.newCursor();\r
+ try{\r
+ String comment = "Mod: " + mi.getName() + " Type: " + mi.getModuleType() + " Path: "\r
+ + GlobalData.getMsaFile(mi).getPath();\r
+ cursor.insertComment(comment);\r
+ }\r
+ catch(Exception e){\r
+ e.printStackTrace();\r
+ }\r
+ finally { \r
+ cursor.dispose();\r
+ }\r
msa.setModuleGuid(mi.getGuid());\r
msa.setModuleVersion(mi.getVersion());\r
msa.setPackageGuid(pi.getGuid());\r
msa.setPackageVersion(pi.getVersion());\r
+ if (arch != null) {\r
+ Vector<String> v = new Vector<String>();\r
+ v.add(arch);\r
+ msa.setSupArchList(v); \r
+ }\r
\r
return msa;\r
}\r
\r
- private void genPcdData (String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal, ModuleSADocument.ModuleSA moduleSa) {\r
+ private void genPcdData (String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal, ModuleSADocument.ModuleSA moduleSa) \r
+ throws PcdItemTypeConflictException, PcdValueMalFormed{\r
if (moduleSa.getPcdBuildDefinition() == null){\r
moduleSa.addNewPcdBuildDefinition();\r
}\r
pcdConsumer = new ArrayList<String>();\r
}\r
String listValue = moduleSa.getModuleGuid() + " " + moduleSa.getModuleVersion() \r
- + " " + moduleSa.getPackageGuid() + " " + moduleSa.getPackageVersion() \r
+ + " " + moduleSa.getPackageGuid() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList())\r
+ " " + itemType;\r
pcdConsumer.add(listValue);\r
dynPcdMap.put(cName + " " + tsGuid, pcdConsumer);\r
//\r
// Special dynamic type, if this pcd already exists in other ModuleSA\r
//\r
+ /* Comment out Item type checking temporarily.\r
if (itemType.equals("DYNAMIC")) {\r
\r
ListIterator li = pcdConsumer.listIterator();\r
while(li.hasNext()) {\r
String value = li.next().toString();\r
String[] valuePart= value.split(" ");\r
- if (!valuePart[4].equals("DYNAMIC")) {\r
+ if (!valuePart[5].equals("DYNAMIC")) {\r
//ToDo error for same pcd, other type than dynamic\r
pcdConsumer.remove(listValue);\r
- return;\r
+ throw new PcdItemTypeConflictException(cName, value);\r
}\r
}\r
}\r
while(li.hasNext()) {\r
String value = li.next().toString();\r
String[] valuePart= value.split(" ");\r
- if (valuePart[4].equals("DYNAMIC")) {\r
+ if (valuePart[5].equals("DYNAMIC")) {\r
//ToDo error for same pcd, other type than non-dynamic\r
pcdConsumer.remove(listValue);\r
- return;\r
+ throw new PcdItemTypeConflictException(cName, value);\r
}\r
}\r
}\r
- \r
+ */\r
PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData fpdPcd = moduleSa.getPcdBuildDefinition().addNewPcdData();\r
fpdPcd.setCName(cName);\r
fpdPcd.setToken(token);\r
fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r
\r
+ if (defaultVal != null){\r
+ fpdPcd.setValue(defaultVal);\r
+ }\r
+ else {\r
+ if (dataType.equals("UINT8") || dataType.equals("UINT16") || dataType.equals("UINT32") || dataType.equals("UINT64")) {\r
+ fpdPcd.setValue("0");\r
+ }\r
+ if (dataType.equals("BOOLEAN")){\r
+ fpdPcd.setValue("false");\r
+ }\r
+ if (dataType.equals("VOID*")) {\r
+ fpdPcd.setValue("");\r
+ }\r
+ }\r
+ if (dataType.equals("UINT8")){\r
+ fpdPcd.setMaxDatumSize(1);\r
+ }\r
+ if (dataType.equals("UINT16")) {\r
+ fpdPcd.setMaxDatumSize(2);\r
+ }\r
+ if (dataType.equals("UINT32")) {\r
+ fpdPcd.setMaxDatumSize(4);\r
+ }\r
+ if (dataType.equals("UINT64")){\r
+ fpdPcd.setMaxDatumSize(8);\r
+ }\r
+ if (dataType.equals("BOOLEAN")){\r
+ fpdPcd.setMaxDatumSize(1);\r
+ }\r
+ if (dataType.equals("VOID*")) {\r
+ int maxSize = setMaxSizeForPointer(fpdPcd.getValue());\r
+ fpdPcd.setMaxDatumSize(maxSize);\r
+ }\r
+ \r
+ \r
if (itemType.equals("DYNAMIC") || itemType.equals("DYNAMIC_EX")) {\r
ArrayList<String> al = LookupDynamicPcdBuildDefinition(cName + " " + tsGuid);\r
//\r
}\r
}\r
else {\r
+ /*\r
if (defaultVal != null){\r
fpdPcd.setValue(defaultVal);\r
}\r
fpdPcd.setValue("");\r
}\r
}\r
+ \r
if (dataType.equals("UINT8")){\r
fpdPcd.setMaxDatumSize(1);\r
}\r
int maxSize = setMaxSizeForPointer(fpdPcd.getValue());\r
fpdPcd.setMaxDatumSize(maxSize);\r
}\r
+ */\r
}\r
}\r
\r
- private int setMaxSizeForPointer(String datum) {\r
+ public int setMaxSizeForPointer(String datum) throws PcdValueMalFormed{\r
if (datum == null) {\r
return 0;\r
}\r
(end > datum.length())||\r
((start == end) && (datum.length() > 0))) {\r
//ToDo Error handling here\r
+ throw new PcdValueMalFormed (datum);\r
}\r
\r
strValue = datum.substring(start + 1, end);\r
if ((start > end) || \r
(end > datum.length())||\r
((start == end) && (datum.length() > 0))) {\r
- \r
+ throw new PcdValueMalFormed (datum);\r
}\r
strValue = datum.substring(start + 1, end);\r
return strValue.length();\r
if (value > 0xFF) {\r
// "[FPD file error] The datum type of PCD %s in %s is VOID*, "+\r
// "it is byte array in fact. But the element of %s exceed the byte range",\r
- \r
+ throw new PcdValueMalFormed (datum); \r
}\r
}\r
return strValueArray.length;\r
// "2) ANSIC string: like \"xxx\";\r\n"+\r
// "3) Byte array: like {0x2, 0x45, 0x23}\r\n"+\r
// "but the datum in seems does not following above format!",\r
- return -1; \r
+ throw new PcdValueMalFormed (datum);\r
\r
}\r
}\r
\r
private ArrayList<String> LookupPlatformPcdData(String pcdKey) {\r
\r
- return dynPcdMap.get("pcdKey");\r
+ return dynPcdMap.get(pcdKey);\r
}\r
\r
public int getDynamicPcdBuildDataCount() {\r
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return 0;\r
}\r
return getfpdDynPcdBuildDefs().getPcdBuildDataList().size();\r
}\r
\r
public void getDynamicPcdBuildData(String[][] saa) {\r
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return ;\r
}\r
List<DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData> l = getfpdDynPcdBuildDefs().getPcdBuildDataList();\r
}\r
}\r
\r
- private void addDynamicPcdBuildData(String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal) {\r
+ public void addDynamicPcdBuildData(String cName, Object token, String tsGuid, String itemType, String dataType, String defaultVal) \r
+ throws PcdValueMalFormed{\r
DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData dynPcdData = getfpdDynPcdBuildDefs().addNewPcdBuildData();\r
dynPcdData.setItemType(PcdItemTypes.Enum.forString(itemType));\r
dynPcdData.setCName(cName);\r
}\r
}\r
\r
- private void removeDynamicPcdBuildData(String cName, String tsGuid) {\r
- XmlObject o = getfpdDynPcdBuildDefs();\r
+ public void removeDynamicPcdBuildData(String cName, String tsGuid) {\r
+ XmlObject o = fpdRoot.getDynamicPcdBuildDefinitions();\r
+ if (o == null) {\r
+ return;\r
+ }\r
\r
XmlCursor cursor = o.newCursor();\r
if (cursor.toFirstChild()) {\r
- DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData pcdBuildData = \r
- (DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData)cursor.getObject();\r
- while (!(pcdBuildData.getCName().equals(cName) && pcdBuildData.getTokenSpaceGuidCName().equals(tsGuid))) {\r
- cursor.toNextSibling();\r
- pcdBuildData = (DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData)cursor.getObject();\r
+ do {\r
+ DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData pcdBuildData = \r
+ (DynamicPcdBuildDefinitionsDocument.DynamicPcdBuildDefinitions.PcdBuildData)cursor.getObject();\r
+ if (pcdBuildData.getCName().equals(cName) && pcdBuildData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+ cursor.removeXml();\r
+ if (getDynamicPcdBuildDataCount() == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
+ cursor.dispose();\r
+ return;\r
+ }\r
}\r
- \r
- cursor.removeXml();\r
+ while (cursor.toNextSibling());\r
}\r
cursor.dispose();\r
}\r
// Get the Sku Info count of ith dyn pcd element.\r
//\r
public int getDynamicPcdSkuInfoCount(int i){\r
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ if (fpdRoot.getDynamicPcdBuildDefinitions() == null || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList() == null \r
+ || fpdRoot.getDynamicPcdBuildDefinitions().getPcdBuildDataList().size() == 0) {\r
return 0;\r
}\r
\r
\r
public void getDynamicPcdSkuInfos(int i, String[][] saa){\r
if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return;\r
}\r
\r
public String getDynamicPcdBuildDataValue(int i){\r
String value = null;\r
if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return value;\r
}\r
\r
public String getDynamicPcdBuildDataVpdOffset(int i){\r
String vpdOffset = null;\r
if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return vpdOffset;\r
}\r
\r
\r
public void removeDynamicPcdBuildDataSkuInfo(int i) {\r
if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
return;\r
}\r
\r
//\r
public void genDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
String hiiDefault, String vpdOffset, String value, int i) {\r
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
- return;\r
- }\r
+// if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+// return;\r
+// }\r
\r
XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
if (cursor.toFirstChild()) {\r
\r
public void updateDynamicPcdBuildDataSkuInfo(String id, String varName, String varGuid, String varOffset, \r
String hiiDefault, String vpdOffset, String value, int i){\r
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
- return;\r
- }\r
+// if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r
+// return;\r
+// }\r
\r
XmlCursor cursor = getfpdDynPcdBuildDefs().newCursor();\r
if (cursor.toFirstChild()) {\r
}\r
}\r
\r
- public void removePcdDataFromLibraryInstance(String moduleKey, String libInstanceKey){\r
- ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
- //\r
- // should better maintain pcd from lib instance only, but maintain all is acceptable now. \r
- //\r
- maintainDynPcdMap(moduleSa.getPcdBuildDefinition(), libInstanceKey);\r
- \r
- }\r
- \r
public BuildOptionsDocument.BuildOptions getfpdBuildOpts() {\r
if (fpdBuildOpts == null) {\r
fpdBuildOpts = fpdRoot.addNewBuildOptions();\r
\r
private void setBuildOptionsUserDefAntTask(String id, String fileName, String execOrder, AntTaskDocument.AntTask at) {\r
at.setId(new Integer(id));\r
+ XmlCursor cursor = at.newCursor();\r
if (fileName != null){\r
at.setFilename(fileName);\r
}\r
+ else if (cursor.toChild(xmlNs, "Filename")) {\r
+ cursor.removeXml();\r
+ }\r
if (execOrder != null) {\r
at.setAntCmdOptions(execOrder);\r
}\r
+ else if (cursor.toChild(xmlNs, "AntCmdOptions")) {\r
+ cursor.removeXml();\r
+ }\r
+ cursor.dispose();\r
}\r
\r
public void removeBuildOptionsUserDefAntTask(int i) {\r
cursor.toNextSibling();\r
}\r
cursor.removeXml();\r
+ if (getBuildOptionsUserDefAntTaskCount() == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
}\r
cursor.dispose();\r
}\r
++i;\r
}\r
}\r
- public void genBuildOptionsOpt(String buildTargets, String toolChain, String tagName, String toolCmd, String archList, String contents) {\r
+ public void genBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents) {\r
OptionsDocument.Options opts = getfpdBuildOpts().getOptions();\r
if (opts == null) {\r
opts = getfpdBuildOpts().addNewOptions();\r
setBuildOptionsOpt(buildTargets, toolChain, tagName, toolCmd, archList, contents, opt);\r
}\r
\r
- private void setBuildOptionsOpt(String buildTargets, String toolChain, String tagName, String toolCmd, String archList, String contents, OptionDocument.Option opt){\r
+ private void setBuildOptionsOpt(Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents, OptionDocument.Option opt){\r
opt.setStringValue(contents);\r
-// opt.setBuildTargets(buildTargets);\r
+ \r
+ opt.setBuildTargets(buildTargets);\r
opt.setToolChainFamily(toolChain);\r
opt.setTagName(tagName);\r
opt.setToolCode(toolCmd);\r
- String[] s = archList.split(" ");\r
- ArrayList<String> al = new ArrayList<String>();\r
- for (int i = 0; i < s.length; ++i) {\r
- al.add(s[i]);\r
+ \r
+ if (archList != null) {\r
+ opt.setSupArchList(archList);\r
+ }\r
+ else {\r
+ if (opt.isSetSupArchList()) {\r
+ opt.unsetSupArchList();\r
+ }\r
}\r
- opt.setSupArchList(al);\r
}\r
\r
public void removeBuildOptionsOpt(int i){\r
cursor.toNextSibling();\r
}\r
cursor.removeXml();\r
+ if (getBuildOptionsOptCount() == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
}\r
cursor.dispose();\r
}\r
\r
- public void updateBuildOptionsOpt(int i, String buildTargets, String toolChain, String tagName, String toolCmd, String archList, String contents) {\r
+ public void updateBuildOptionsOpt(int i, Vector<Object> buildTargets, String toolChain, String tagName, String toolCmd, Vector<Object> archList, String contents) {\r
XmlObject o = getfpdBuildOpts().getOptions();\r
if (o == null) {\r
return;\r
cursor.toNextSibling(qSections);\r
}\r
if (cursor.toFirstChild()) {\r
- for (int m = 0; m < k; ++m) {\r
+ int m = 0;\r
+ for (; m < k; ++m) {\r
cursor.toNextSibling();\r
}\r
cursor.removeXml();\r
+ if (m == 0) {\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
+ }\r
}\r
}\r
cursor.dispose();\r
while(li.hasNext()) {\r
BuildOptionsDocument.BuildOptions.Ffs.Sections.Sections2.Section section = li.next();\r
if (section.isSetSectionType()) {\r
- al.add(section.getSectionType().toString());\r
- }\r
+ al.add(section.getSectionType().toString());\r
+ }\r
\r
}\r
}\r
}\r
\r
public void setPlatformDefsSupportedArchs(Vector<Object> archs) {\r
- getfpdPlatformDefs().setSupportedArchitectures(archs);\r
+ if (archs != null) {\r
+ getfpdPlatformDefs().setSupportedArchitectures(archs);\r
+ }\r
+// else {\r
+// XmlCursor cursor = getfpdPlatformDefs().newCursor();\r
+// if (cursor.toChild(xmlNs, "SupportedArchitectures")) {\r
+// cursor.removeXml();\r
+// }\r
+// cursor.dispose();\r
+// }\r
}\r
\r
public void getPlatformDefsBuildTargets(Vector<Object> targets) {\r
\r
public void getPlatformDefsSkuInfos(String[][] saa){\r
if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {\r
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+ removeElement(getfpdDynPcdBuildDefs());\r
+ fpdDynPcdBuildDefs = null;\r
+ }\r
return ;\r
}\r
\r
}\r
\r
public void setPlatformDefsOutputDir(String outputDir) {\r
- getfpdPlatformDefs().setOutputDirectory(outputDir);\r
+ if (outputDir != null && outputDir.length() > 0) {\r
+ getfpdPlatformDefs().setOutputDirectory(outputDir);\r
+ }\r
+ else{\r
+ XmlCursor cursor = getfpdPlatformDefs().newCursor();\r
+ if (cursor.toChild(new QName(xmlNs, "OutputDirectory"))) {\r
+ cursor.removeXml();\r
+ }\r
+ cursor.dispose();\r
+ }\r
}\r
\r
public FlashDocument.Flash getfpdFlash() {\r
return fdf.getStringValue();\r
}\r
\r
- \r
- \r
public void genFvImagesNameValue(String name, String value) {\r
\r
FvImagesDocument.FvImages fi = getfpdFlash().getFvImages();\r
if (fpdHdr == null) {\r
fpdHdr = fpdRoot.addNewPlatformHeader();\r
}\r
- genPlatformDefsSkuInfo("0", "DEFAULT");\r
+ \r
return fpdHdr;\r
}\r
\r
\r
public String getFpdHdrSpec() {\r
\r
- return "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
+ return "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
// return getFpdHdr().getSpecification();\r
}\r
\r
}\r
\r
public void setFpdHdrSpec(String s){\r
- s = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
+ s = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
getFpdHdr().setSpecification(s);\r
}\r
/**\r
\r
}\r
\r
- private String listToString(List<String> l) {\r
+ private String listToString(List l) {\r
if (l == null) {\r
return null;\r
}\r
}\r
return s.trim();\r
}\r
+ \r
+ private void removeElement(XmlObject o) {\r
+ XmlCursor cursor = o.newCursor();\r
+ cursor.removeXml();\r
+ cursor.dispose();\r
+ }\r
+}\r
+\r
+class PcdItemTypeConflictException extends Exception {\r
+\r
+ /**\r
+ * \r
+ */\r
+ private static final long serialVersionUID = 1L;\r
+ private String details = null;\r
+ \r
+ PcdItemTypeConflictException(String pcdName, String info){\r
+ ModuleIdentification mi = GlobalData.getModuleId(info);\r
+ details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackage().getName();\r
+ }\r
+ \r
+ public String getMessage() {\r
+ return details;\r
+ }\r
+}\r
+\r
+class PcdDeclNotFound extends Exception {\r
+\r
+ /**\r
+ * \r
+ */\r
+ private static final long serialVersionUID = 1L;\r
+ private String details = null;\r
+ \r
+ PcdDeclNotFound(String info) {\r
+ details = "PcdDeclNotFound: " + info;\r
+ }\r
+ \r
+ public String getMessage() {\r
+ return details;\r
+ }\r
+}\r
+\r
+class PcdValueMalFormed extends Exception {\r
+\r
+ /**\r
+ * \r
+ */\r
+ private static final long serialVersionUID = 1L;\r
+ private String details = null;\r
+ \r
+ PcdValueMalFormed(String info) {\r
+ details = "PcdValueMalFormed: " + info;\r
+ }\r
+ \r
+ public String getMessage() {\r
+ return details;\r
+ }\r
}\r
projects / mirror_edk2.git / blobdiff