modify r8onlylib generate

[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 5fb102091c2ca13c630eb435215ef872c077d9c5..07f93cecadc85bbde1560a87ab6384e8846a7296 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -281,12 +281,21 @@ public final class SourceFileReplacer implements Common.ForDoAll {
                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
+               Pattern ptnr8only = Pattern.compile("////#?(\\w*)?(.*?R8_(\\w*).*?)////~", Pattern.DOTALL);\r
                Matcher mtrr8only = ptnr8only.matcher(line);\r
                Matcher mtrr8onlyhead;\r
+               \r
+               //add head comment\r
+               Matcher mtrr8onlyheadcomment = Critic.PTN_NEW_HEAD_COMMENT.matcher(line);\r
+               if (mtrr8onlyheadcomment.find()) {\r
+                       outfile1.append(mtrr8onlyheadcomment.group() + "\n\n");\r
+                       outfile2.append(mtrr8onlyheadcomment.group() + "\n\n");\r
+               }\r
+               \r
+               //add functions body\r
                while (mtrr8only.find()) {\r
-                       if (mi.hashr8only.contains(mtrr8only.group(2))) {\r
-                               paragraph = mtrr8only.group();\r
+                       if (mi.hashr8only.contains(mtrr8only.group(3))) {\r
+                               paragraph = mtrr8only.group(2);\r
                                outfile1.append(paragraph + "\n\n");\r
                                if (mtrr8only.group(1).length() != 0) {\r
                                        mi.hashrequiredr9libs.add(mtrr8only.group(1));\r