add EdkModule Guid

nmake.()

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 7a37484914af705264ecf9a1da7fcd44e2aca088..2bb9e2b354ba004da9407c910ab924848f44c5de 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -36,6 +36,9 @@ public class MigrationTool {
         //MigrationTool.ui.yesOrNo("go on replace?");\r
         SourceFileReplacer.fireAt(mi);    // some adding library actions are taken here,so it must be put before "MsaWriter"\r
 \r
         //MigrationTool.ui.yesOrNo("go on replace?");\r
         SourceFileReplacer.fireAt(mi);    // some adding library actions are taken here,so it must be put before "MsaWriter"\r
 \r

+        //MigrationTool.ui.yesOrNo("go on delete?");\r
+        Common.deleteDir(mi.modulepath + File.separator + "temp");\r
+\r

         //MigrationTool.ui.yesOrNo("go on show?");\r
         // show result\r
         if (MigrationTool.printModuleInfo) {\r
         //MigrationTool.ui.yesOrNo("go on show?");\r
         // show result\r
         if (MigrationTool.printModuleInfo) {\r


@@ -60,9 +63,6 @@ public class MigrationTool {
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);\r
         }\r
 \r
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);\r
         }\r
 \r

-        //MigrationTool.ui.yesOrNo("go on delete?");\r
-        Common.deleteDir(mi.modulepath + File.separator + "temp");\r
-\r

         MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);\r
         MigrationTool.ui.println("Complete!");\r
         //MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");\r
         MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);\r
         MigrationTool.ui.println("Complete!");\r
         //MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index a0a53d668cc594acf3c0c91291ac3e97a51a3a39..383353c66bb2385e066d9f93e13408e6fce8d3db 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -97,7 +97,7 @@ public final class ModuleReader implements Common.ForDoAll {
                     }\r
                 }\r
             }\r
                     }\r
                 }\r
             }\r

-            if (mtrsection.group(1).matches("nmake.common")) {\r
+            if (mtrsection.group(1).contains("nmake.")) {\r

                 mtrinfequation = ptninfequation.matcher(mtrsection.group(2));\r
                 while (mtrinfequation.find()) {\r
                     if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {\r
                 mtrinfequation = ptninfequation.matcher(mtrsection.group(2));\r
                 while (mtrinfequation.find()) {\r
                     if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {\r


@@ -130,7 +130,7 @@ public final class ModuleReader implements Common.ForDoAll {
     \r
     private final void preProcessModule() throws Exception {\r
        // according to .inf file, add extraordinary includes and sourcefiles\r
     \r
     private final void preProcessModule() throws Exception {\r
        // according to .inf file, add extraordinary includes and sourcefiles\r

-        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");\r
+        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");        // collect all Laplace.namechange to here???\r

         \r
        if (!mi.infincludes.isEmpty()) {\r
             Iterator<String> it = mi.infincludes.iterator();\r
         \r
        if (!mi.infincludes.isEmpty()) {\r
             Iterator<String> it = mi.infincludes.iterator();\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index fa9e0074eefe795b164661acf6f74e21bb30e442..62de225b5c48f5b77cfae9fb9982d57087dd9afa 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -123,6 +123,7 @@ public class MsaWriter {
         md.setOutputFileBasename(mi.modulename);\r
         \r
         pd.addNewPackage().setPackageGuid("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");\r
         md.setOutputFileBasename(mi.modulename);\r
         \r
         pd.addNewPackage().setPackageGuid("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");\r

+        pd.addNewPackage().setPackageGuid("68169ab0-d41b-4009-9060-292c253ac43d");\r

         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");\r
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
         externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");\r
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
         externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r