X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdFileContents.java;h=b89f967fa3e53000e18993fbbb172b84a1e35dce;hp=946a6b64d9d8a4fea1d1d22d6eda493c4062bca6;hb=ac66fadf6fae5f54b17fb50728a82ffb32b829fa;hpb=78388089937561fb1478467c39a20fecd326f015

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 946a6b64d9..b89f967fa3 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
@@ -70,6 +70,7 @@ import org.tianocore.frameworkwizard.packaging.PackageIdentification;
 public class FpdFileContents {
 
     static final String xmlNs = "http://www.TianoCore.org/2006/Edk2.0";
+    static final String regNewLineAndSpaces = "((\n)|(\r\n)|(\r)|(\u0085)|(\u2028)|(\u2029))(\\s)*";
     
     private PlatformSurfaceAreaDocument fpdd = null;
     
@@ -345,10 +346,21 @@ public class FpdFileContents {
             }
             
             cursor.push();
-            cursor.toPrevToken();
+            while (cursor.hasPrevToken()) {
+                cursor.toPrevToken();
+                if (!cursor.isText()) {
+                    break;
+                }
+                String s = cursor.getTextValue();
+                if (s.matches(regNewLineAndSpaces)) {
+                    continue;
+                }
+            }
+
             if (cursor.isComment()) {
                 cursor.removeXml();
             }
+            
             cursor.pop();
             cursor.removeXml();
             if (getFrameworkModulesCount() == 0) {
@@ -655,6 +667,7 @@ public class FpdFileContents {
                 ModuleSADocument.ModuleSA moduleSA = getModuleSA(moduleKey);
                 if (moduleSA.getPcdBuildDefinition() != null) {
                     XmlCursor cursor = moduleSA.getPcdBuildDefinition().newCursor();
+                    cursor.push();
                     if (cursor.toFirstChild()) {
                         do {
                             PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor
@@ -669,6 +682,11 @@ public class FpdFileContents {
                             }
                         } while (cursor.toNextSibling());
                     }
+                    
+                    cursor.pop();
+                    if (moduleSA.getPcdBuildDefinition().getPcdDataList().size() == 0) {
+                        cursor.removeXml();
+                    }
                     cursor.dispose();
                 }
             }
@@ -718,7 +736,17 @@ public class FpdFileContents {
                 cursor.toNextSibling();
             }
             cursor.push();
-            cursor.toPrevToken();
+            while (cursor.hasPrevToken()) {
+                cursor.toPrevToken();
+                if (!cursor.isText()) {
+                    break;
+                }
+                String s = cursor.getTextValue();
+                if (s.matches(regNewLineAndSpaces)) {
+                    continue;
+                }
+            }
+            
             if (cursor.isComment()) {
                 cursor.removeXml();
             }