let critic prepared

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 7d9859c815c34cf52b5607d41260fb740d08530b..a12be4a9a876308354d594fc255c25f3fdfd57d1 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -44,11 +44,7 @@ public final class SourceFileReplacer {
                \r
                String outname = null;\r
                String inname = null;\r
-               /*\r
-               if (ModuleInfo.ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {\r
-                       showdetails = true;\r
-               }\r
-               */\r
+\r
                showdetails = true;                     // set this as default now, may be changed in the future\r
                \r
                Iterator<String> di = mi.localmodulesources.iterator();\r
@@ -60,16 +56,16 @@ public final class SourceFileReplacer {
                                } else {\r
                                        outname = inname;\r
                                }\r
-                               ModuleInfo.ui.println("\nModifying file: " + inname);\r
-                               Common.string2file(sourcefilereplace(mi.modulepath + File.separator + "temp" + File.separator + inname), mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
+                               MigrationTool.ui.println("\nModifying file: " + inname);\r
+                               Common.string2file(sourcefilereplace(mi.modulepath + File.separator + "temp" + File.separator + inname), MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
                        } else if (inname.contains(".h") || inname.contains(".H") || inname.contains(".dxs") || inname.contains(".uni")) {\r
                                if (inname.contains(".H")) {\r
                                        outname = inname.replaceFirst(".H", ".h");\r
                                } else {\r
                                        outname = inname;\r
                                }\r
-                               ModuleInfo.ui.println("\nCopying file: " + inname);\r
-                               Common.string2file(Common.file2string(mi.modulepath + File.separator + "temp" + File.separator + inname), mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
+                               MigrationTool.ui.println("\nCopying file: " + inname);\r
+                               Common.string2file(Common.file2string(mi.modulepath + File.separator + "temp" + File.separator + inname), MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + outname);\r
                        }\r
                }\r
 \r
@@ -80,10 +76,9 @@ public final class SourceFileReplacer {
        \r
        private static final void addr8only() throws Exception {\r
                String paragraph = null;\r
-               String line = Common.file2string(ModuleInfo.db.DatabasePath + File.separator + "R8Lib.c");\r
-               //Common.ensureDir(mi.modulepath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c");\r
-               PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c")));\r
-               PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.h")));\r
+               String line = Common.file2string(MigrationTool.db.DatabasePath + File.separator + "R8Lib.c");\r
+               PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c")));\r
+               PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.h")));\r
                Pattern ptnr8only = Pattern.compile("////#?(\\w*)?.*?R8_(\\w*).*?////~", Pattern.DOTALL);\r
                Matcher mtrr8only = ptnr8only.matcher(line);\r
                Matcher mtrr8onlyhead;\r
@@ -115,9 +110,6 @@ public final class SourceFileReplacer {
                BufferedReader rd = new BufferedReader(new FileReader(filename));\r
                StringBuffer wholefile = new StringBuffer();\r
                String line;\r
-               String r8thing;\r
-               String r9thing;\r
-               r8tor9 temp;\r
                boolean addr8 = false;\r
 \r
                Pattern pat = Pattern.compile("g?(BS|RT)(\\s*->\\s*)([a-zA-Z_]\\w*)", Pattern.MULTILINE);                                       // ! only two level () bracket allowed !\r
@@ -131,7 +123,7 @@ public final class SourceFileReplacer {
                // replace BS -> gBS , RT -> gRT\r
                Matcher mat = pat.matcher(line);\r
                if (mat.find()) {                                                                                               // add a library here\r
-                       ModuleInfo.ui.println("Converting all BS->gBS, RT->gRT");\r
+                       MigrationTool.ui.println("Converting all BS->gBS, RT->gRT");\r
                        line = mat.replaceAll("g$1$2$3");                                                       //unknown correctiveness\r
                }\r
                mat.reset();\r
@@ -148,11 +140,13 @@ public final class SourceFileReplacer {
                Pattern patentrypoint = Pattern.compile("EFI_DRIVER_ENTRY_POINT[^\\}]*\\}");\r
                Matcher matentrypoint = patentrypoint.matcher(line);\r
                if (matentrypoint.find()) {\r
-                       ModuleInfo.ui.println("Deleting Entry_Point");\r
+                       MigrationTool.ui.println("Deleting Entry_Point");\r
                        line = matentrypoint.replaceAll("");\r
                }\r
                */\r
                // start replacing names\r
+               String r8thing;\r
+               String r9thing;\r
                Iterator<String> it;\r
                // Converting non-locla function\r
                it = mi.hashnonlocalfunc.iterator();\r
@@ -166,10 +160,11 @@ public final class SourceFileReplacer {
                                mi.hashrequiredr9libs.add("UefiRuntimeServicesTableLib");               //a\r
                                mi.hashrequiredr9libs.add("DxeServicesTableLib");                               //l\r
                        } else {                                                                                                                        //\r
-                               mi.hashrequiredr9libs.add(ModuleInfo.db.getR9Lib(r8thing));                             // add a library here\r
+                               mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));                          // add a library here\r
                        }\r
-                       \r
-                       if ((r9thing = ModuleInfo.db.getR9Func(r8thing)) != null) {\r
+\r
+                       r8tor9 temp;\r
+                       if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {\r
                                if (!r8thing.equals(r9thing)) {\r
                                        if (line.contains(r8thing)) {\r
                                                line = line.replaceAll(r8thing, r9thing);\r
@@ -177,7 +172,7 @@ public final class SourceFileReplacer {
                                                Iterator<r8tor9> rt = filefunc.iterator();\r
                                                while (rt.hasNext()) {\r
                                                        temp = rt.next();\r
-                                                       if (ModuleInfo.db.r8only.contains(temp.r8thing)) {\r
+                                                       if (MigrationTool.db.r8only.contains(temp.r8thing)) {\r
                                                                filer8only.add(r8thing);\r
                                                                mi.hashr8only.add(r8thing);\r
                                                                addr8 = true;\r
@@ -195,8 +190,8 @@ public final class SourceFileReplacer {
                it = mi.hashnonlocalmacro.iterator();\r
                while (it.hasNext()) {                                          //macros are all assumed MdePkg currently\r
                        r8thing = it.next();\r
-                       //mi.hashrequiredr9libs.add(ModuleInfo.db.getR9Lib(r8thing));           \r
-                       if ((r9thing = ModuleInfo.db.getR9Macro(r8thing)) != null) {\r
+                       //mi.hashrequiredr9libs.add(MigrationTool.db.getR9Lib(r8thing));                \r
+                       if ((r9thing = MigrationTool.db.getR9Macro(r8thing)) != null) {\r
                                if (line.contains(r8thing)) {\r
                                        line = line.replaceAll(r8thing, r9thing);\r
                                        filemacro.add(new r8tor9(r8thing, r9thing));\r
@@ -263,7 +258,7 @@ public final class SourceFileReplacer {
                show(fileppi, "ppi");\r
                show(fileprotocol, "protocol");\r
                if (!filer8only.isEmpty()) {\r
-                       ModuleInfo.ui.println("Converting r8only : " + filer8only);\r
+                       MigrationTool.ui.println("Converting r8only : " + filer8only);\r
                }\r
 \r
                filefunc.clear();\r
@@ -281,12 +276,12 @@ public final class SourceFileReplacer {
                r8tor9 temp;\r
                if (showdetails) {\r
                        if (!hash.isEmpty()) {\r
-                               ModuleInfo.ui.print("Converting " + sh + " : ");\r
+                               MigrationTool.ui.print("Converting " + sh + " : ");\r
                                while (it.hasNext()) {\r
                                        temp = it.next();\r
-                                       ModuleInfo.ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");\r
+                                       MigrationTool.ui.print("[" + temp.r8thing + "->" + temp.r9thing + "] ");\r
                                }\r
-                               ModuleInfo.ui.println("");\r
+                               MigrationTool.ui.println("");\r
                        }\r
                }\r
        }\r
@@ -298,7 +293,7 @@ public final class SourceFileReplacer {
                it = hash.iterator();\r
                while (it.hasNext()) {\r
                        r8thing = it.next();\r
-                       if ((r9thing = ModuleInfo.db.getR9Guidname(r8thing)) != null) {\r
+                       if ((r9thing = MigrationTool.db.getR9Guidname(r8thing)) != null) {\r
                                if (!r8thing.equals(r9thing)) {\r
                                        if (line.contains(r8thing)) {\r
                                                line = line.replaceAll(r8thing, r9thing);\r