Turn to Regex in ModuleReader.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 82e34eea147f608e81b6084833c3d40522b2a8fa..2c3c97274e5ba3bde5400520e21dea6fdc4d8045 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -58,12 +58,12 @@ public class MsaWriter {
                if (mi.modulename != null) {\r
                        msaheader.setModuleName(mi.modulename);\r
                } else {\r
                if (mi.modulename != null) {\r
                        msaheader.setModuleName(mi.modulename);\r
                } else {\r

-                       msaheader.setModuleName(mi.modulename = Query("ModuleName Not Found . Please Input ModuleName"));\r
+                       msaheader.setModuleName(mi.modulename = Query("Module Name Not Found!  Please Input ModuleName"));\r

                }\r
                if (mi.guidvalue != null) {\r
                        msaheader.setGuidValue(mi.guidvalue);\r
                } else {\r
                }\r
                if (mi.guidvalue != null) {\r
                        msaheader.setGuidValue(mi.guidvalue);\r
                } else {\r

-                       msaheader.setGuidValue(mi.guidvalue = Query("GuidValue Not Found . Please Input GuidValue"));\r
+                       msaheader.setGuidValue(mi.guidvalue = Query("Guid Value Not Found!  Please Input Guid Value"));\r

                }\r
                if (mi.moduletype != null) {\r
                        if (mi.moduletype.contains("PEI")) {\r
                }\r
                if (mi.moduletype != null) {\r
                        if (mi.moduletype.contains("PEI")) {\r


@@ -72,13 +72,13 @@ public class MsaWriter {
                                msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));\r
                        }\r
                } else {\r
                                msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));\r
                        }\r
                } else {\r

-                       msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("GuidValue Not Found . Please Input GuidValue")));\r
+                       msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found!  Please Input Guid Value")));\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
                }\r
 \r
                msaheader.setCopyright("Copyright (c) 2006, Intel Corporation");\r
                msaheader.setVersion("1.0");\r
                msaheader.setAbstract("Component name for module " + mi.modulename);\r

-               msaheader.setDescription("FIX ME!");                                                    //???\r
+               msaheader.setDescription("FIX ME!");\r

                msaheader.addNewLicense().setStringValue("All rights reserved.\n" +\r
                                "      This software and associated documentation (if any) is furnished\n" +\r
                                "      under a license and may only be used or copied in accordance\n" +\r
                msaheader.addNewLicense().setStringValue("All rights reserved.\n" +\r
                                "      This software and associated documentation (if any) is furnished\n" +\r
                                "      under a license and may only be used or copied in accordance\n" +\r


@@ -103,9 +103,17 @@ public class MsaWriter {
                externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
                externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
                \r
                externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
                externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
                \r

+               FilenameDocument.Filename filename;\r

                it = mi.localmodulesources.iterator();\r
                it = mi.localmodulesources.iterator();\r

+               //System.out.println(mi.localmodulesources);\r

                while (it.hasNext()) {\r
                while (it.hasNext()) {\r

-                       sourcefiles.addNewFilename().setStringValue(it.next());\r
+                       temp = it.next();\r
+                       filename = sourcefiles.addNewFilename();\r
+                       filename.setStringValue(temp);\r
+                       //if (temp.contains("x64" + File.separator)) {\r
+                               //System.out.println("find");\r
+                               //filename.setSupArchList();\r
+                       //}\r

                }\r
                if (!mi.protocol.isEmpty()) {\r
                        protocols = msa.addNewProtocols();\r
                }\r
                if (!mi.protocol.isEmpty()) {\r
                        protocols = msa.addNewProtocols();\r