editable comment style

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index faa3efefb1399fbedd57aa32e5fe49f8ac831359..bc3fd75cb21e97f78de05a0031302891c674f28c 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -27,22 +27,26 @@ public final class ModuleReader {
        \r
        public static final void ModuleScan(ModuleInfo m) throws Exception {\r
                mi = m;\r
-               \r
+\r
                Common.toDoAll(mi.modulepath, ModuleInfo.class.getMethod("enroll", String.class), mi, null, Common.FILE);\r
-               \r
+\r
                String filename = null;\r
                if (mi.msaorinf.isEmpty()) {\r
                        MigrationTool.ui.println("No INF nor MSA file found!");\r
                        System.exit(0);\r
                } else {\r
-                       filename = MigrationTool.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
+                       if (mi.msaorinf.size() == 1) {\r
+                               filename = (String)mi.msaorinf.toArray()[0];\r
+                       } else {\r
+                               filename = MigrationTool.ui.choose("Found .inf or .msa file for module\n" + mi.modulepath + "\nChoose one Please", mi.msaorinf.toArray());\r
+                       }\r
                }\r
                if (filename.contains(".inf")) {\r
                        readInf(filename);\r
                } else if (filename.contains(".msa")) {\r
                        readMsa(filename);\r
                }\r
-               \r
+\r
                CommentOutNonLocalHFile();\r
                parsePreProcessedSourceCode();\r
 \r
@@ -132,18 +136,29 @@ public final class ModuleReader {
                        rd = new BufferedReader(new FileReader(mi.modulepath + File.separator + curFile));\r
                        Common.ensureDir(mi.modulepath + File.separator + "temp" + File.separator + curFile);\r
                        outfile = new PrintWriter(new BufferedWriter(new FileWriter(mi.modulepath + File.separator + "temp" + File.separator + curFile)));\r
+                       \r
+                       /*\r
+                       if (curFile.contains(".dxs")) {\r
+                               if (mi.moduletype.contains("PEI")) {\r
+                                       \r
+                               } else {\r
+                                       \r
+                               }\r
+                       }\r
+                       */\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.contains("#include")) {\r
                                        mtrinclude = ptninclude.matcher(line);\r
                                        if (mtrinclude.find() && mi.localmodulesources.contains(mtrinclude.group(1))) {\r
                                        } else {\r
-                                               line = MigrationTool.migrationcomment + line;\r
+                                               line = MigrationTool.MIGRATIONCOMMENT + line;\r
                                        }\r
                                }\r
                                outfile.append(line + '\n');\r
                        }\r
                        outfile.flush();\r
                        outfile.close();\r
+                       \r
                }\r
        }\r
 \r