add EdkModule Guid

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index e159c5e4ea4b7edd5fcd4f309d6d4828d8033cda..2bb9e2b354ba004da9407c910ab924848f44c5de 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -21,7 +21,7 @@ public class MigrationTool {
     public static UI ui = null;\r
     public static Database db = null;\r
 \r
-    public static String MIGRATIONCOMMENT = "//%@//";\r
+    public static String MIGRATIONCOMMENT = "//@MT:";\r
 \r
     public static boolean printModuleInfo = false;\r
     public static boolean doCritic = false;\r
@@ -31,11 +31,14 @@ public class MigrationTool {
 \r
     private static final void mainFlow(ModuleInfo mi) throws Exception {\r
 \r
-        ModuleReader.ModuleScan(mi);\r
+        ModuleReader.aimAt(mi);\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
@@ -60,9 +63,6 @@ public class MigrationTool {
             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
@@ -76,7 +76,7 @@ public class MigrationTool {
 \r
     private static final String assignOutPutPath(String inputpath) {\r
         if (MigrationTool.defaultoutput) {\r
-            return inputpath.replaceAll(Common.strseparate, "$1");\r
+            return inputpath.replaceAll(Common.STRSEPARATER, "$1");\r
         } else {\r
             return MigrationTool.ui.getFilepath("Please choose where to place the output module", JFileChooser.DIRECTORIES_ONLY);\r
         }\r