comment out item type checking temporarily when adding module to fpd file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1177 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 22 insertions, 3 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 63b9d6713d..b8c80b48cc 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -873,6 +873,7 @@ public class FpdFileContents {
         //

         // Special dynamic type, if this pcd already exists in other ModuleSA

         //

+        /* Comment out Item type checking temporarily.

         if (itemType.equals("DYNAMIC")) {

             

             ListIterator li = pcdConsumer.listIterator();

@@ -898,7 +899,7 @@ public class FpdFileContents {
                 }

             }

         }

-        

+        */

         PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData fpdPcd = moduleSa.getPcdBuildDefinition().addNewPcdData();

         fpdPcd.setCName(cName);

         fpdPcd.setToken(token);

@@ -2320,7 +2321,7 @@ public class FpdFileContents {
         if (fpdHdr == null) {

             fpdHdr = fpdRoot.addNewPlatformHeader();

         }

-        genPlatformDefsSkuInfo("0", "DEFAULT");

+        

         return fpdHdr;

     }

     

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
index 4ca854c927..ea6171fac7 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
@@ -20,6 +20,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ComponentEvent;

 import java.awt.event.FocusAdapter;

 import java.awt.event.FocusEvent;

+import java.util.Vector;

 

 import javax.swing.JButton;

 import javax.swing.JFrame;

@@ -534,7 +535,24 @@ public class FpdHeader extends IInternalFrame {
         if (ffc.getFpdHdrSpec() != null) {

             jTextFieldSpecification.setText(ffc.getFpdHdrSpec());

         }

-        ffc.setFpdHdrSpec(jTextFieldSpecification.getText());    

+        ffc.setFpdHdrSpec(jTextFieldSpecification.getText());

+        

+        ffc.genPlatformDefsSkuInfo("0", "DEFAULT");

+        Vector<Object> v = new Vector<Object>();

+        ffc.getPlatformDefsSupportedArchs(v);

+        if (v.size() == 0) {

+            v.add("IA32");

+            ffc.setPlatformDefsSupportedArchs(v);

+        }

+        v.removeAllElements();

+        ffc.getPlatformDefsBuildTargets(v);

+        if (v.size() == 0) {

+            v.add("DEBUG");

+            ffc.setPlatformDefsBuildTargets(v);

+        }

+        if (ffc.getPlatformDefsInterDir() == null) {

+            ffc.setPlatformDefsInterDir("UNIFIED");

+        }

     }

 

     /**