git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b...

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 3576578202f68cef37e63865d82a0d107cc37bf7..72d39bbd77cef28fe9816cfc4fa3cd3e133127fe 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -38,7 +38,6 @@ public class ModuleInfo {
        public String entrypoint = null;\r
        \r
        public Set<String> localmodulesources = new HashSet<String>();          //contains both .c and .h\r
        public String entrypoint = null;\r
        \r
        public Set<String> localmodulesources = new HashSet<String>();          //contains both .c and .h\r

-       public Set<String> localmoduleheaders = new HashSet<String>();\r

        public Set<String> preprocessedccodes = new HashSet<String>();\r
        \r
        public Set<String> hashfuncc = new HashSet<String>();\r
        public Set<String> preprocessedccodes = new HashSet<String>();\r
        \r
        public Set<String> hashfuncc = new HashSet<String>();\r


@@ -69,8 +68,7 @@ public class ModuleInfo {
                                if (list[i].contains(".c") || list[i].contains(".C")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".h") || list[i].contains(".H")) {\r
                                if (list[i].contains(".c") || list[i].contains(".C")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".h") || list[i].contains(".H")) {\r

-                                       localmodulesources.add(list[i]);\r
-                                       localmoduleheaders.add(list[i]);        //the case that several .inf or .msa found is not concerned\r
+                                       localmodulesources.add(list[i]);        //the case that several .inf or .msa found is not concerned\r

                                } else if (list[i].contains(".dxs")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".uni")) {\r
                                } else if (list[i].contains(".dxs")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".uni")) {\r


@@ -161,7 +159,7 @@ public class ModuleInfo {
                        while ((line = rd.readLine()) != null) {\r
                                if (line.contains("#include")) {\r
                                        mtcinclude = ptninclude.matcher(line);\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.contains("#include")) {\r
                                        mtcinclude = ptninclude.matcher(line);\r

-                                       if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) {\r
+                                       if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) {\r

                                        } else {\r
                                                line = migrationcomment + line;\r
                                        }\r
                                        } else {\r
                                                line = migrationcomment + line;\r
                                        }\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index c7e2fea3c0a30035536939529252dda613920efc..6f56e51969c0706a00c870046316be2306b8a2e5 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -216,7 +216,6 @@ public class SourceFileReplacer {
                                                        if (r8only.contains(temp.r8thing)) {\r
                                                                mi.localmodulesources.add("R8Lib.h");\r
                                                                mi.localmodulesources.add("R8Lib.c");\r
                                                        if (r8only.contains(temp.r8thing)) {\r
                                                                mi.localmodulesources.add("R8Lib.h");\r
                                                                mi.localmodulesources.add("R8Lib.c");\r

-                                                               mi.localmoduleheaders.add("R8Lib.h");\r

                                                                filer8only.add(r8thing);\r
                                                                mi.hashr8only.add(r8thing);\r
                                                                addr8 = true;\r
                                                                filer8only.add(r8thing);\r
                                                                mi.hashr8only.add(r8thing);\r
                                                                addr8 = true;\r