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
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
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
+ XmlCursor cursor = getfpdFrameworkModules().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
if (o == null) {\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
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(int i){\r
- if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
- return 0;\r
- }\r
- \r
- XmlCursor cursor = getfpdFrameworkModules().newCursor();\r
- ModuleSADocument.ModuleSA msa = null;\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
+ ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
\r
if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
return 0;\r
}\r
\r
public void getPcdData(int i, String[][] saa) {\r
- if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
- return;\r
- }\r
- \r
- XmlCursor cursor = getfpdFrameworkModules().newCursor();\r
- ModuleSADocument.ModuleSA msa = null;\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
+ ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
\r
if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
return;\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
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
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
* @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
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
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
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
import java.util.Iterator;\r
import java.util.Map;\r
import java.util.Set;\r
+import java.util.Vector;\r
\r
public class FpdFrameworkModules extends IInternalFrame {\r
\r
\r
private FpdFileContents ffc = null;\r
private OpeningPlatformType docConsole = null;\r
- private Map<String, String> fpdMsa = null;\r
+ private Map<String, ArrayList<String>> fpdMsa = null;\r
\r
private ArrayList<ModuleIdentification> miList = null;\r
\r
jTable = new JTable(model);\r
jTable.setRowHeight(20);\r
model.addColumn("ModuleName");\r
- model.addColumn("ModuleGUID");\r
model.addColumn("ModuleVersion");\r
- model.addColumn("PackageGUID");\r
+ model.addColumn("PackageName");\r
model.addColumn("PackageVersion");\r
+ model.addColumn("Path");\r
\r
jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
}\r
return;\r
}\r
\r
- String mg = (String)model.getValueAt(selectedRow, 1);\r
- String mv = (String)model.getValueAt(selectedRow, 2);\r
- String pg = (String)model.getValueAt(selectedRow, 3);\r
- String pv = (String)model.getValueAt(selectedRow, 4);\r
- if (fpdMsa.containsKey(mg + mv + pg + pv)) {\r
- JOptionPane.showMessageDialog(frame, "This Module Already Added.");\r
- return;\r
+ String path = model.getValueAt(selectedRow, 4)+"";\r
+ ModuleIdentification mi = miList.get(selectedRow);\r
+ Vector<String> vArchs = null;\r
+ try {\r
+ vArchs = GlobalData.getModuleSupArchs(mi);\r
+ }\r
+ catch (Exception exp) {\r
+ JOptionPane.showMessageDialog(frame, exp.getMessage());\r
}\r
- //ToDo put Arch instead of null\r
- fpdMsa.put(mg + mv + pg + pv, null);\r
\r
- String[] row = {" ", mg, mv, pg, pv};\r
- ModuleIdentification mi = getModuleId(mg + " " + mv + " " + pg + " " + pv);\r
- if (mi != null) {\r
- row[0] = mi.getName();\r
- row[2] = mi.getVersion();\r
- row[4] = mi.getPackage().getVersion();\r
+ if (vArchs == null) {\r
+ JOptionPane.showMessageDialog(frame, "No supported Archs specified in MSA file.");\r
+ return;\r
}\r
- model1.addRow(row);\r
\r
- docConsole.setSaved(false);\r
- try{\r
- ffc.addFrameworkModulesPcdBuildDefs(mi, null);\r
+ String archsAdded = "";\r
+ String mg = mi.getGuid();\r
+ String mv = mi.getVersion();\r
+ String pg = mi.getPackage().getGuid();\r
+ String pv = mi.getPackage().getVersion();\r
+ \r
+ ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
+ if (al == null) {\r
+ al = new ArrayList<String>();\r
+ fpdMsa.put(mg + mv + pg + pv, al);\r
+ }\r
+ for (int i = 0; i < al.size(); ++i) {\r
+ vArchs.remove(al.get(i));\r
}\r
- catch (Exception exception) {\r
- JOptionPane.showMessageDialog(frame, "PCD Insertion Fail. " + exception.getMessage());\r
+ //\r
+ // Archs this Module supported have already been added.\r
+ //\r
+ if (vArchs.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "This Module Already Added.");\r
+ return;\r
}\r
- JOptionPane.showMessageDialog(frame, "This Module Added Successfully.");\r
+ //ToDo put Arch instead of null\r
+ for (int i = 0; i < vArchs.size(); ++i) {\r
+ String arch = vArchs.get(i);\r
+ al.add(arch);\r
+ archsAdded += arch + " ";\r
+ String[] row = {"", mv, "", pv, arch, path};\r
+ \r
+ if (mi != null) {\r
+ row[0] = mi.getName();\r
+ row[2] = mi.getPackage().getName();\r
+ \r
+ }\r
+ model1.addRow(row);\r
+ \r
+ docConsole.setSaved(false);\r
+ try{\r
+ //ToDo : specify archs need to add.\r
+ ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);\r
+ }\r
+ catch (Exception exception) {\r
+ JOptionPane.showMessageDialog(frame, "PCD Insertion Fail. " + exception.getMessage());\r
+ }\r
+ }\r
+ \r
+ \r
+ JOptionPane.showMessageDialog(frame, "This Module with Arch "+ archsAdded +" Added Successfully.");\r
jTable1.changeSelection(model1.getRowCount()-1, 0, false, false);\r
}\r
});\r
jTable1 = new JTable(model1);\r
jTable1.setRowHeight(20);\r
model1.addColumn("ModuleName");\r
- model1.addColumn("ModuleGUID");\r
model1.addColumn("ModuleVersion"); \r
- model1.addColumn("PackageGUID");\r
+ model1.addColumn("PackageName");\r
model1.addColumn("PackageVersion");\r
-// model1.addColumn("SupportedArch");\r
+ model1.addColumn("SupportedArch");\r
+ model1.addColumn("Path");\r
\r
jTable1.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
}\r
settingDlg = new FpdModuleSA(ffc);\r
}\r
docConsole.setSaved(false);\r
- String mg = model1.getValueAt(selectedRow, 1)+"";\r
- String mv = model1.getValueAt(selectedRow, 2)+"";\r
- String pg = model1.getValueAt(selectedRow, 3)+"";\r
- String pv = model1.getValueAt(selectedRow, 4)+"";\r
- settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv, selectedRow);\r
+ String[] sa = new String[5];\r
+ ffc.getFrameworkModuleInfo(selectedRow, sa);\r
+ String mg = sa[0];\r
+ String mv = sa[1];\r
+ String pg = sa[2];\r
+ String pv = sa[3];\r
+ String arch = sa[4];\r
+ settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv + " " + arch, selectedRow);\r
settingDlg.setVisible(true);\r
}\r
});\r
if (selectedRow < 0){\r
return;\r
}\r
- String mg = model1.getValueAt(selectedRow, 1).toString();\r
- String mv = model1.getValueAt(selectedRow, 2).toString();\r
- String pg = model1.getValueAt(selectedRow, 3).toString();\r
- String pv = model1.getValueAt(selectedRow, 4).toString();\r
+ String[] sa = new String[5];\r
+ ffc.getFrameworkModuleInfo(selectedRow, sa);\r
+ String mg = sa[0];\r
+ String mv = sa[1];\r
+ String pg = sa[2];\r
+ String pv = sa[3];\r
+ String arch = sa[4];\r
+ ModuleIdentification mi = getModuleId(sa[0] + " " + sa[1] + " " + sa[2] + " " + sa[3] + " " + sa[4]);\r
+ mv = mi.getVersion();\r
+ pv = mi.getPackage().getVersion();\r
model1.removeRow(selectedRow);\r
- fpdMsa.remove(mg+mv+pg+pv);\r
+ if (arch == null) {\r
+ // if no arch specified in ModuleSA\r
+ fpdMsa.remove(mg+mv+pg+pv);\r
+ }\r
+ else {\r
+ ArrayList<String> al = fpdMsa.get(mg+mv+pg+pv);\r
+ al.remove(arch);\r
+ if (al.size() == 0) {\r
+ fpdMsa.remove(mg+mv+pg+pv);\r
+ }\r
+ }\r
+ \r
+ \r
docConsole.setSaved(false);\r
ffc.removeModuleSA(selectedRow);\r
}\r
}\r
\r
if (fpdMsa == null) {\r
- fpdMsa = new HashMap<String, String>();\r
+ fpdMsa = new HashMap<String, ArrayList<String>>();\r
}\r
\r
if (ffc.getFrameworkModulesCount() > 0) {\r
String[][] saa = new String[ffc.getFrameworkModulesCount()][5];\r
ffc.getFrameworkModulesInfo(saa);\r
for (int i = 0; i < saa.length; ++i) {\r
- ModuleIdentification mi = getModuleId(saa[i][1]+ " "+saa[i][2]+" "+saa[i][3]+" "+saa[i][4]);\r
+ ModuleIdentification mi = getModuleId(saa[i][0]+ " "+saa[i][1]+" "+saa[i][2]+" "+saa[i][3]);\r
+ String[] row = {"", "", "", "", "", ""};\r
if (mi != null) {\r
- saa[i][0] = mi.getName();\r
- saa[i][2] = mi.getVersion();\r
- saa[i][4] = mi.getPackage().getVersion();\r
+ row[0] = mi.getName();\r
+ row[1] = mi.getVersion();\r
+ row[2] = mi.getPackage().getName();\r
+ row[3] = mi.getPackage().getVersion();\r
+ row[4] = saa[i][4];\r
+ try{\r
+ row[5] = GlobalData.getMsaFile(mi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ }\r
+ catch (Exception e) {\r
+ JOptionPane.showMessageDialog(frame, "ShowFPDModules:" + e.getMessage());\r
+ }\r
+ }\r
+ model1.addRow(row);\r
+ ArrayList<String> al = fpdMsa.get(saa[i][0]+row[1]+saa[i][2]+row[3]);\r
+ if (al == null) {\r
+ al = new ArrayList<String>();\r
+ fpdMsa.put(saa[i][0]+row[1]+saa[i][2]+row[3], al);\r
}\r
- model1.addRow(saa[i]);\r
- fpdMsa.put(saa[i][1]+saa[i][2]+saa[i][3]+saa[i][4], saa[i][0]);\r
+ al.add(saa[i][4]);\r
+ \r
}\r
}\r
\r
while(ispi.hasNext()) {\r
PackageIdentification pi = (PackageIdentification)ispi.next();\r
String[] s = {"", "", "", "", ""};\r
- s[3] = pi.getGuid();\r
- s[4] = pi.getVersion();\r
+ \r
Set<ModuleIdentification> smi = GlobalData.getModules(pi);\r
Iterator ismi = smi.iterator();\r
while(ismi.hasNext()) {\r
ModuleIdentification mi = (ModuleIdentification)ismi.next();\r
s[0] = mi.getName();\r
- s[1] = mi.getGuid();\r
- s[2] = mi.getVersion();\r
+ s[1] = mi.getVersion();\r
+ s[2] = pi.getName();\r
+ s[3] = pi.getVersion();\r
+ try {\r
+ s[4] = GlobalData.getMsaFile(mi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ }\r
+ catch (Exception e) {\r
+ JOptionPane.showMessageDialog(frame, "ShowAllModules:" + e.getMessage());\r
+ }\r
model.addRow(s);\r
miList.add(mi);\r
}\r
\r
private ModuleIdentification getModuleId(String key){\r
//\r
- // Get ModuleGuid, ModuleVersion, PackageGuid, PackageVersion into string array.\r
+ // Get ModuleGuid, ModuleVersion, PackageGuid, PackageVersion, Arch into string array.\r
//\r
String[] keyPart = key.split(" ");\r
Set<PackageIdentification> spi = GlobalData.getPackageList();\r
\r
public void setKey(String k, int i){\r
this.moduleKey = k;\r
+ \r
jTabbedPane.setSelectedIndex(0);\r
initPcdBuildDefinition(i);\r
}\r
//\r
// display library classes that need to be resolved. also potential instances for them.\r
//\r
- resolveLibraryInstances(key);\r
+ resolveLibraryInstances(moduleKey);\r
//\r
// display lib instances already selected for key\r
//\r
if (ffsKey != null) {\r
jTextField2.setText(ffsKey);\r
}\r
+ \r
+ optionsTableModel.setRowCount(0);\r
+ String[][] saa = new String[ffc.getModuleSAOptionsCount(key)][6];\r
+ ffc.getModuleSAOptions(key, saa);\r
+ for (int i = 0; i < saa.length; ++i) {\r
+ optionsTableModel.addRow(saa[i]);\r
+ }\r
}\r
\r
private void resolveLibraryInstances(String key) {\r
//\r
// remove pcd information of instance from current ModuleSA\r
//\r
- ffc.removePcdData(moduleKey, mi);\r
+ ffc.removePcdData(key, mi);\r
//\r
// remove class produced by this instance and add back these produced class to be bound.\r
//\r
\r
private ModuleIdentification getModuleId(String key){\r
//\r
- // Get ModuleGuid, ModuleVersion, PackageGuid, PackageVersion into string array.\r
+ // Get ModuleGuid, ModuleVersion, PackageGuid, PackageVersion, Arch into string array.\r
//\r
String[] keyPart = key.split(" ");\r
Set<PackageIdentification> spi = GlobalData.getPackageList();\r
\r
while(ispi.hasNext()) {\r
PackageIdentification pi = (PackageIdentification)ispi.next();\r
- if ( !pi.getGuid().equals(keyPart[2])){\r
-// || !pi.getVersion().equals(keyPart[3])){\r
+ if ( !pi.getGuid().equals(keyPart[2])){ \r
+\r
continue;\r
}\r
+ if (keyPart[3] != null && keyPart[3].length() > 0 && !keyPart[3].equals("null")){\r
+ if(!pi.getVersion().equals(keyPart[3])){\r
+ continue;\r
+ }\r
+ }\r
Set<ModuleIdentification> smi = GlobalData.getModules(pi);\r
Iterator ismi = smi.iterator();\r
while(ismi.hasNext()) {\r
ModuleIdentification mi = (ModuleIdentification)ismi.next();\r
if (mi.getGuid().equals(keyPart[0])){\r
-// && mi.getVersion().equals(keyPart[1])){\r
+ if (keyPart[1] != null && keyPart[1].length() > 0 && !keyPart[1].equals("null")){\r
+ if(!mi.getVersion().equals(keyPart[1])){\r
+ continue;\r
+ }\r
+ }\r
+\r
return mi;\r
}\r
}\r
private JPanel getJPanel4() {\r
if (jPanel4 == null) {\r
jLabel1 = new JLabel();\r
- jLabel1.setText("Library Classes Consumed");\r
+ jLabel1.setText("Library Classes Uninstantiated");\r
jPanel4 = new JPanel();\r
jPanel4.add(jLabel1, null);\r
jPanel4.add(getJScrollPane3(), null);\r
// Add pcd information of selected instance to current moduleSA\r
//\r
try{\r
- ffc.addFrameworkModulesPcdBuildDefs(getModuleId(instanceValue), ffc.getModuleSA(moduleKey));\r
+ ffc.addFrameworkModulesPcdBuildDefs(getModuleId(instanceValue), null, ffc.getModuleSA(moduleKey));\r
}\r
catch (Exception exception) {\r
JOptionPane.showMessageDialog(frame, "PCD Insertion Fail. " + exception.getMessage());\r
public void actionPerformed(ActionEvent arg0) {\r
\r
if (arg0.getSource() == jButton2) {\r
-// ffc.removeLibraryInstances(moduleKey);\r
-// for (int i = 0; i < model1.getRowCount(); ++i) {\r
-// String mg = model1.getValueAt(i, 1)+"";\r
-// String mv = model1.getValueAt(i, 2)+"";\r
-// String pg = model1.getValueAt(i, 3)+"";\r
-// String pv = model1.getValueAt(i, 4)+"";\r
-// ffc.genLibraryInstance(mg, mv, pg, pv, moduleKey);\r
-// }\r
+ if (jTable4.isEditing()) {\r
+ jTable4.getCellEditor().stopCellEditing();\r
+ }\r
+ ffc.setFvBinding(moduleKey, jTextField.getText());\r
+ ffc.setFfsFileNameGuid(moduleKey, jTextField1.getText());\r
+ ffc.setFfsFormatKey(moduleKey, jTextField2.getText());\r
this.setVisible(false);\r
}\r
}\r
if (jTextField == null) {\r
jTextField = new JTextField();\r
jTextField.setPreferredSize(new java.awt.Dimension(100,20));\r
- jTextField.addFocusListener(new java.awt.event.FocusAdapter() {\r
- public void focusLost(java.awt.event.FocusEvent e) {\r
- ffc.setFvBinding(moduleKey, jTextField.getText());\r
- }\r
- });\r
+ \r
}\r
return jTextField;\r
}\r
if (jTextField1 == null) {\r
jTextField1 = new JTextField();\r
jTextField1.setPreferredSize(new java.awt.Dimension(100,20));\r
- jTextField1.addFocusListener(new java.awt.event.FocusAdapter() {\r
- public void focusLost(java.awt.event.FocusEvent e) {\r
- ffc.setFfsFileNameGuid(moduleKey, jTextField1.getText());\r
- }\r
- });\r
+ \r
}\r
return jTextField1;\r
}\r
if (jTextField2 == null) {\r
jTextField2 = new JTextField();\r
jTextField2.setPreferredSize(new java.awt.Dimension(100,20));\r
- jTextField2.addFocusListener(new java.awt.event.FocusAdapter() {\r
- public void focusLost(java.awt.event.FocusEvent e) {\r
- ffc.setFfsFormatKey(moduleKey, jTextField2.getText());\r
- }\r
- });\r
+ \r
}\r
return jTextField2;\r
}\r
jButton4.setText("New");\r
jButton4.addActionListener(new java.awt.event.ActionListener() {\r
public void actionPerformed(java.awt.event.ActionEvent e) {\r
- String[] row = {"", "", "", "", "IA32", ""};\r
+ String[] row = {"", "", "", "", "", ""};\r
optionsTableModel.addRow(row);\r
Vector<Object> v = new Vector<Object>();\r
- Vector<Object> v1 = new Vector<Object>();\r
- v1.add("IA32");\r
+ Vector<Object> v1 = null;\r
+ \r
ffc.genModuleSAOptionsOpt(moduleKey, v, "", "", "", v1, "");\r
}\r
});\r
ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);\r
for (int i = 0; i < al.size(); ++i) {\r
String[] s = al.get(i).split(" ");\r
- String mKey = s[0] + s[1] + s[2] + s[3];\r
+ String mKey = s[0] + " " + s[1]+ " " + s[2] + " " + s[3];\r
ffc.updatePcdData(mKey, cName, tsGuid, jComboBox.getSelectedItem()+"", jTextField3.getText(), jTextField4.isVisible() ? jTextField4.getText() : jComboBox1.getSelectedItem()+"");\r
s[4] = jComboBox.getSelectedItem()+"";\r
al.set(i, s[0]+" "+s[1]+" "+s[2]+" "+s[3]+" "+s[4]);\r
\r
\r
import javax.swing.JCheckBox;\r
+import javax.swing.JOptionPane;\r
import javax.swing.JTextField;\r
import javax.swing.JLabel;\r
import javax.swing.JScrollPane;\r
if (jCheckBox6.isSelected()) {\r
v.add("PPC");\r
}\r
+ \r
}\r
\r
/**\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
jCheckBox5 = new JCheckBox();\r
jCheckBox5.setPreferredSize(new java.awt.Dimension(52,20));\r
jCheckBox5.setText("ARM");\r
+ jCheckBox5.setVisible(false);\r
jCheckBox5.addItemListener(new java.awt.event.ItemListener() {\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
jCheckBox6 = new JCheckBox();\r
jCheckBox6.setPreferredSize(new Dimension(50, 20));\r
jCheckBox6.setText("PPC");\r
+ jCheckBox6.setVisible(false);\r
jCheckBox6.addItemListener(new java.awt.event.ItemListener() {\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
Vector<Object> v = new Vector<Object>();\r
getToolChain(v);\r
+ if (v.size() == 0) {\r
+ JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+ return;\r
+ }\r
ffc.setPlatformDefsSupportedArchs(v);\r
}\r
});\r
import java.util.HashSet;\r
import java.util.Iterator;\r
import java.util.List;\r
+import java.util.ListIterator;\r
import java.util.Map;\r
import java.util.Set;\r
+import java.util.Vector;\r
import java.util.logging.Logger;\r
\r
/**\r
///\r
private static Set<FpdModuleIdentification> builtModules = new HashSet<FpdModuleIdentification>();\r
\r
- ///\r
- /// PCD memory database stored all PCD information which collected from FPD,MSA and SPD.\r
- ///\r
-// private static final MemoryDatabaseManager pcdDbManager = new MemoryDatabaseManager();\r
-\r
- ///\r
- /// build target + tool chain family/tag name + arch + command types + command options\r
- ///\r
- private static Map<String, Object> toolChainOptions;\r
- private static Map<String, Object> toolChainFamilyOptions;\r
- private static Map<String, String> toolChainDefinitions;\r
- ///\r
- ///\r
- ///\r
- private static Set<String> targets;\r
- ///\r
- ///\r
- ///\r
- private static Set<String> toolChainFamilies;\r
- ///\r
- ///\r
- ///\r
- private static Set<String> toolChains;\r
- ///\r
- /// keep track which toolchain family a toolchain tag belongs to\r
- ///\r
- private static Map<String, Set<String>> toolChainFamilyMap;\r
- private static Map<String, Set<String>> toolChainCommandMap;\r
- \r
- ///\r
- /// list of Arch: EBC, ARM, IA32, X64, IPF, PPC\r
- ///\r
- private static Set<String> archs;\r
-\r
- ///\r
- /// list of Command Type: CC, LIB, LINK, ASL, ASM, ASMLINK, PP\r
- ///\r
- private static Set<String> commandTypes;\r
- \r
/**\r
Parse framework database (DB) and all SPD files listed in DB to initialize\r
the environment for next build. This method will only be executed only once\r
return result;\r
}\r
\r
- ////// Tool Chain Related, try to refine and put some logic process to ToolChainFactory\r
- public static void setBuildToolChainFamilyOptions(Map<String, Object> map) {\r
- toolChainFamilyOptions = map;\r
- }\r
-\r
- public static Map<String, Object> getToolChainFamilyOptions() {\r
- return toolChainFamilyOptions;\r
- }\r
-\r
- public static void setBuildToolChainOptions(Map<String, Object> map) {\r
- toolChainOptions = map;\r
- }\r
-\r
- public static Map<String, Object> getToolChainOptions() {\r
- return toolChainOptions;\r
- }\r
-\r
- public static void setTargets(Set<String> targetSet) {\r
- GlobalData.log.info("TargetSet: " + targetSet);\r
- targets = targetSet;\r
- }\r
-\r
- public static String[] getTargets() {\r
- return (String[])targets.toArray(new String[targets.size()]);\r
- }\r
-\r
- public static void setToolChains(Set<String> toolChainSet) {\r
- toolChains = toolChainSet;\r
- }\r
-\r
- public static String[] getToolChains() {\r
- String[] toolChainList = new String[toolChains.size()];\r
- return (String[])toolChains.toArray(toolChainList);\r
- }\r
-\r
- public static void setToolChainFamilies(Set<String> toolChainFamilySet) {\r
- toolChainFamilies = toolChainFamilySet;\r
- }\r
-\r
- public static void setToolChainFamiliyMap(Map<String, Set<String>> map) {\r
- /*\r
- Set<String> keys = map.keySet();\r
- Iterator it = keys.iterator();\r
- while (it.hasNext()) {\r
- String toolchain = (String)it.next();\r
- Set<String> familyMap = (Set<String>)map.get(toolchain);\r
- Iterator fit = familyMap.iterator();\r
- System.out.print(toolchain + ": ");\r
- while (fit.hasNext()) {\r
- System.out.print((String)fit.next() + " ");\r
- }\r
- System.out.println("");\r
+ \r
+ public static Vector<String> getModuleSupArchs(ModuleIdentification mi) throws Exception{\r
+ Vector<String> vArchs = null;\r
+ ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)getModuleXmlObject(mi);\r
+ if (msa.getModuleDefinitions() == null || msa.getModuleDefinitions().getSupportedArchitectures() == null) {\r
+ return vArchs;\r
}\r
- */\r
- toolChainFamilyMap = map;\r
- }\r
-\r
- public static String[] getToolChainFamilies() {\r
- String[] toolChainFamilyList = new String[toolChainFamilies.size()];\r
- return (String[])toolChainFamilies.toArray(toolChainFamilyList);\r
- }\r
-\r
- public static String[] getToolChainFamilies(String toolChain) {\r
- Set<String> familySet = (Set<String>)toolChainFamilyMap.get(toolChain);\r
- String[] toolChainFamilyList = new String[familySet.size()];\r
- return (String[])familySet.toArray(toolChainFamilyList);\r
- }\r
-\r
- public static Set<String> getToolChainFamilySet(String toolChain) {\r
- return (Set<String>)toolChainFamilyMap.get(toolChain);\r
- }\r
-\r
- public static void setArchs(Set<String> archSet) {\r
- archs = archSet;\r
- }\r
-\r
- public static String[] getArchs() {\r
- String[] archList = new String[archs.size()];\r
- return (String[])archs.toArray(archList);\r
- }\r
- /*\r
-\r
- */\r
- public static void SetCommandTypes(Set<String> commandTypeSet) {\r
- commandTypes = commandTypeSet;\r
- }\r
- /*\r
-\r
- */\r
- public static void SetCommandTypes(Map<String, Set<String>> commandTypeMap) {\r
- toolChainCommandMap = commandTypeMap;\r
- }\r
- /*\r
-\r
- */\r
- public static String[] getCommandTypes() {\r
- String[] commandList = new String[commandTypes.size()];\r
- return (String[])commandTypes.toArray(commandList);\r
- }\r
- /*\r
-\r
- */\r
- public static String[] getCommandTypes(String toolChain) {\r
- Set<String> commands = (Set<String>)toolChainCommandMap.get(toolChain);\r
- if (commands == null) {\r
- return new String[0];\r
+ ListIterator li = msa.getModuleDefinitions().getSupportedArchitectures().listIterator();\r
+ while (li.hasNext()) {\r
+ if (vArchs == null) {\r
+ vArchs = new Vector<String>();\r
+ }\r
+ vArchs.add((String)li.next());\r
}\r
-\r
- String[] commandList = new String[commands.size()];\r
- return (String[])commands.toArray(commandList);\r
- }\r
- /*\r
-\r
- */\r
- public static String getCommandSetting(String commandDescString) {\r
- return (String)toolChainDefinitions.get(commandDescString);\r
- }\r
- /*\r
-\r
- */\r
- public static void setToolChainDefinitions(Map<String, String> def) {\r
- toolChainDefinitions = def;\r
- }\r
-\r
- public static Map<String, String> getToolChainDefinitions() {\r
- return toolChainDefinitions;\r
+ \r
+ return vArchs;\r
}\r
-\r
+ \r
}\r
\r
final class KeyComparator implements Comparator<String> {\r
projects / mirror_edk2.git / commitdiff