X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FMigrationTool.java;h=fea4f8b9b0aeae08a144e720075cc36312119aae;hb=55bfa0f1aea986c67ba87905ccbb2df8b69fad0b;hp=e159c5e4ea4b7edd5fcd4f309d6d4828d8033cda;hpb=27e0221a8578226815bf0d7f3606dc6136c90de4;p=mirror_edk2.git

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index e159c5e4ea..fea4f8b9b0 100644
--- 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;
     public static Database db = null;
 
-    public static String MIGRATIONCOMMENT = "//%@//";
+    public static String MIGRATIONCOMMENT = "//@MT:";
 
     public static boolean printModuleInfo = false;
     public static boolean doCritic = false;
@@ -31,11 +31,14 @@ public class MigrationTool {
 
     private static final void mainFlow(ModuleInfo mi) throws Exception {
 
-        ModuleReader.ModuleScan(mi);
+        ModuleReader.aimAt(mi);
         
         //MigrationTool.ui.yesOrNo("go on replace?");
         SourceFileReplacer.fireAt(mi);    // some adding library actions are taken here,so it must be put before "MsaWriter"
 
+        //MigrationTool.ui.yesOrNo("go on delete?");
+        Common.deleteDir(mi.modulepath + File.separator + "temp");
+
         //MigrationTool.ui.yesOrNo("go on show?");
         // show result
         if (MigrationTool.printModuleInfo) {
@@ -60,9 +63,6 @@ public class MigrationTool {
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);
         }
 
-        //MigrationTool.ui.yesOrNo("go on delete?");
-        Common.deleteDir(mi.modulepath + File.separator + "temp");
-
         MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);
         MigrationTool.ui.println("Complete!");
         //MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");
@@ -73,10 +73,14 @@ public class MigrationTool {
         MigrationTool.ui.println(show + hash.size());
         MigrationTool.ui.println(hash);
     }
-
+/*
+    public static final String getTempDir(String modulepath) {
+    	return "C:" + File.separator + "MigrationTool_Temp" + File.separator + modulepath.replaceAll(ui., arg1);
+    }
+*/
     private static final String assignOutPutPath(String inputpath) {
         if (MigrationTool.defaultoutput) {
-            return inputpath.replaceAll(Common.strseparate, "$1");
+            return inputpath.replaceAll(Common.STRSEPARATER, "$1");
         } else {
             return MigrationTool.ui.getFilepath("Please choose where to place the output module", JFileChooser.DIRECTORIES_ONLY);
         }