git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1250 6f19259b...

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 25d959f67a2560a8b88a2d21fc4f94faf4b4f987..82e34eea147f608e81b6084833c3d40522b2a8fa 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -36,9 +36,9 @@ public class MsaWriter {
        private MsaHeaderDocument.MsaHeader msaheader = msa.addNewMsaHeader();\r
        private ModuleDefinitionsDocument.ModuleDefinitions md = msa.addNewModuleDefinitions();\r
        private SourceFilesDocument.SourceFiles sourcefiles = msa.addNewSourceFiles();  //found local .h files are not written\r
-       private GuidsDocument.Guids guids = msa.addNewGuids();\r
-       private ProtocolsDocument.Protocols protocols = msa.addNewProtocols();\r
-       private PPIsDocument.PPIs ppis = msa.addNewPPIs();\r
+       private GuidsDocument.Guids guids;\r
+       private ProtocolsDocument.Protocols protocols;\r
+       private PPIsDocument.PPIs ppis;\r
        private PackageDependenciesDocument.PackageDependencies pd = msa.addNewPackageDependencies();\r
        private LibraryClassDefinitionsDocument.LibraryClassDefinitions libclassdefs = msa.addNewLibraryClassDefinitions();\r
        private ExternsDocument.Externs externs = msa.addNewExterns();\r
@@ -74,6 +74,7 @@ public class MsaWriter {
                } else {\r
                        msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("GuidValue Not Found . Please Input GuidValue")));\r
                }\r
+\r
                msaheader.setCopyright("Copyright (c) 2006, Intel Corporation");\r
                msaheader.setVersion("1.0");\r
                msaheader.setAbstract("Component name for module " + mi.modulename);\r
@@ -86,6 +87,7 @@ public class MsaWriter {
                                "      reproduced, stored in a retrieval system, or transmitted in any\n" +\r
                                "      form or by any means without the express written consent of\n" +\r
                                "      Intel Corporation.");\r
+               msaheader.setSpecification("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052");\r
                \r
                List<Enum> arch = new ArrayList<Enum>();\r
                arch.add(SupportedArchitectures.IA_32);\r
@@ -105,28 +107,37 @@ public class MsaWriter {
                while (it.hasNext()) {\r
                        sourcefiles.addNewFilename().setStringValue(it.next());\r
                }\r
-               it = mi.protocol.iterator();\r
-               while (it.hasNext()) {\r
-                       if ((temp = it.next()) != null) {\r
-                               ProtocolsDocument.Protocols.Protocol pr = protocols.addNewProtocol();\r
-                               pr.setProtocolCName(temp);\r
-                               pr.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+               if (!mi.protocol.isEmpty()) {\r
+                       protocols = msa.addNewProtocols();\r
+                       it = mi.protocol.iterator();\r
+                       while (it.hasNext()) {\r
+                               if ((temp = it.next()) != null) {\r
+                                       ProtocolsDocument.Protocols.Protocol pr = protocols.addNewProtocol();\r
+                                       pr.setProtocolCName(temp);\r
+                                       pr.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+                               }\r
                        }\r
                }\r
-               it = mi.ppi.iterator();\r
-               while (it.hasNext()) {\r
-                       if ((temp = it.next()) != null) {\r
-                               PPIsDocument.PPIs.Ppi pp = ppis.addNewPpi();\r
-                               pp.setPpiCName(temp);\r
-                               pp.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+               if (!mi.ppi.isEmpty()) {\r
+                       ppis = msa.addNewPPIs();\r
+                       it = mi.ppi.iterator();\r
+                       while (it.hasNext()) {\r
+                               if ((temp = it.next()) != null) {\r
+                                       PPIsDocument.PPIs.Ppi pp = ppis.addNewPpi();\r
+                                       pp.setPpiCName(temp);\r
+                                       pp.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+                               }\r
                        }\r
                }\r
-               it = mi.guid.iterator();\r
-               while (it.hasNext()) {\r
-                       if ((temp = it.next()) != null) {\r
-                               GuidsDocument.Guids.GuidCNames gcn = guids.addNewGuidCNames();\r
-                               gcn.setGuidCName(temp);\r
-                               gcn.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+               if (!mi.guid.isEmpty()) {\r
+                       guids = msa.addNewGuids();\r
+                       it = mi.guid.iterator();\r
+                       while (it.hasNext()) {\r
+                               if ((temp = it.next()) != null) {\r
+                                       GuidsDocument.Guids.GuidCNames gcn = guids.addNewGuidCNames();\r
+                                       gcn.setGuidCName(temp);\r
+                                       gcn.setUsage(UsageTypes.ALWAYS_CONSUMED);\r
+                               }\r
                        }\r
                }\r
                it = mi.hashrequiredr9libs.iterator();\r