git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b...
authoralfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 14 Aug 2006 07:03:21 +0000 (07:03 +0000)
committeralfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 14 Aug 2006 07:03:21 +0000 (07:03 +0000)
Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java

index 3576578..72d39bb 100644 (file)
@@ -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
index c7e2fea..6f56e51 100644 (file)
@@ -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