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
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
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.getPackageGuid().equals(s[2])) {\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
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 && pcdBuildDef.getPcdDataList() != null) {\r
ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> li = pcdBuildDef.getPcdDataList().listIterator();\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
for(int i = 0; i < al.size(); ++i){\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
}\r
//\r
- // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer"\r
+ // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
//\r
- public int getPcdDataCount(String key){\r
- ModuleSADocument.ModuleSA msa = getModuleSA(key);\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
return msa.getPcdBuildDefinition().getPcdDataList().size();\r
+ \r
}\r
\r
- public void getPcdData(String key, String[][] saa) {\r
- ModuleSADocument.ModuleSA msa = getModuleSA(key);\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
ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData>li = msa.getPcdBuildDefinition().getPcdDataList().listIterator();\r
- for (int i = 0; i < saa.length; ++i) {\r
+ for (int k = 0; k < saa.length; ++k) {\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()+"";\r
- saa[i][3] = pcdData.getToken().toString();\r
- saa[i][4] = pcdData.getMaxDatumSize()+"";\r
- saa[i][5] = pcdData.getDatumType()+"";\r
- saa[i][6] = pcdData.getValue();\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
}\r
catch (Exception e){\r
-// e.printStackTrace();\r
+ e.printStackTrace();\r
throw e;\r
}\r
\r
while(li.hasNext()) {\r
PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry)li.next();\r
ModuleSADocument.ModuleSA moduleSA = getModuleSA(moduleKey);\r
- XmlCursor cursor = moduleSA.getPcdBuildDefinition().newCursor();\r
- if (cursor.toFirstChild()) {\r
- PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
- if (msaPcd.getCName().equals(pcdData.getCName()) && 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()) && msaPcd.getTokenSpaceGuidCName().equals(pcdData.getTokenSpaceGuidCName())) {\r
- maintainDynPcdMap(pcdData.getCName()+" "+pcdData.getTokenSpaceGuidCName(), 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
- cursor.dispose();\r
}\r
\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
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
return;\r
}\r
if(msa.getModuleSaBuildOptions() == null){\r
- msa.addNewModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);\r
- return;\r
+ msa.addNewModuleSaBuildOptions();\r
+ \r
}\r
- msa.getModuleSaBuildOptions().setFfsFileNameGuid(fileGuid);\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
msa.addNewModuleSaBuildOptions().setFfsFormatKey(ffsKey);\r
return;\r
}\r
- msa.getModuleSaBuildOptions().setFvBinding(ffsKey);\r
+ msa.getModuleSaBuildOptions().setFfsFormatKey(ffsKey);\r
}\r
\r
public void getModuleSAOptions(String moduleKey, String[][] saa) {\r
ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
- if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
|| msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
return ;\r
}\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][2] = listToString(opt.getSupArchList());\r
+ saa[i][4] = listToString(opt.getSupArchList());\r
\r
}\r
- saa[i][3] = opt.getToolCode();\r
- saa[i][4] = opt.getTagName();\r
+ \r
saa[i][5] = opt.getStringValue();\r
\r
++i;\r
\r
public int getModuleSAOptionsCount(String moduleKey){\r
ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
- if (msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
+ if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null\r
|| msa.getModuleSaBuildOptions().getOptions().getOptionList() == null) {\r
return 0;\r
}\r
* @param mi\r
* @param moduleSa if null, generate a new ModuleSA.\r
*/\r
- public void addFrameworkModulesPcdBuildDefs(ModuleIdentification mi, ModuleSADocument.ModuleSA moduleSa) throws Exception {\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);\r
+ moduleSa = genModuleSA(mi, arch);\r
}\r
\r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)GlobalData.getModuleXmlObject(mi);\r
\r
}\r
catch (Exception e){\r
-// e.printStackTrace();\r
+ e.printStackTrace();\r
throw e; \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
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
\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
public void removeDynamicPcdBuildData(String cName, String tsGuid) {\r
- XmlObject o = getfpdDynPcdBuildDefs();\r
+ XmlObject o = fpdRoot.getDynamicPcdBuildDefinitions();\r
+ if (o == null) {\r
+ return;\r
+ }\r
\r
XmlCursor cursor = o.newCursor();\r
if (cursor.toFirstChild()) {\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
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
opt.setTagName(tagName);\r
opt.setToolCode(toolCmd);\r
\r
- opt.setSupArchList(archList);\r
+ if (archList != null) {\r
+ opt.setSupArchList(archList);\r
+ }\r
+ else {\r
+ if (opt.isSetSupArchList()) {\r
+ opt.unsetSupArchList();\r
+ }\r
+ }\r
}\r
\r
public void removeBuildOptionsOpt(int i){\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
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
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