enhance MsaOwner.java

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / MsaWriter.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 23ea8b27f6046fe741d54a6408c6dc38d3941e9f..72fa0679762073618e0b37ba02f9cc30a875abaa 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -20,12 +20,11 @@ import org.tianocore.SupportedArchitectures.Enum;
 import org.apache.xmlbeans.*;\r
 \r
 public class MsaWriter {\r
-    MsaWriter(ModuleInfo moduleinfo) {\r
-        mi = moduleinfo;\r
-    }\r
-\r
+       MsaWriter(ModuleInfo moduleinfo) {\r
+               mi = moduleinfo;\r
+       }\r
+       \r
     private ModuleInfo mi;\r
-    \r
     private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();\r
     \r
     private ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = msadoc.addNewModuleSurfaceArea();\r
@@ -120,13 +119,13 @@ public class MsaWriter {
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");\r
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
         if (mi.entrypoint != null) {\r
-          externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
-          org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();\r
-          if (moduleType == ModuleTypeDef.PEIM) {\r
-              mi.hashrequiredr9libs.add("PeimEntryPoint");\r
-          } else {\r
-              mi.hashrequiredr9libs.add("UefiDriverEntryPoint");\r
-          }\r
+            externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
+            org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();\r
+            if (moduleType == ModuleTypeDef.PEIM) {\r
+                mi.hashrequiredr9libs.add("PeimEntryPoint");\r
+            } else {\r
+                mi.hashrequiredr9libs.add("UefiDriverEntryPoint");\r
+            }\r
         }\r
        \r
         it = mi.localmodulesources.iterator();\r
@@ -168,7 +167,7 @@ public class MsaWriter {
         }\r
         it = mi.hashrequiredr9libs.iterator();\r
         while (it.hasNext()) {\r
-            if ((temp = it.next()) != null && !temp.matches("%")) {\r
+            if ((temp = it.next()) != null && !temp.matches("%") && !temp.matches("n/a")) {\r
                 LibraryClassDocument.LibraryClass lc = libclassdefs.addNewLibraryClass();\r
                 lc.setKeyword(temp);\r
                 lc.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
@@ -206,7 +205,7 @@ public class MsaWriter {
         bw.flush();\r
         bw.close();\r
     }\r
-    \r
+\r
     public static final void parse(String msafile) throws Exception {\r
         ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.parse(msafile);\r
         flush("c:\\temp.msa", msadoc);\r