From 03af6beba5f15564ff10aa1766f224c2f25a530a Mon Sep 17 00:00:00 2001 From: alfred Date: Mon, 14 Aug 2006 07:03:21 +0000 Subject: [PATCH] git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b-4bc3-4df7-8a09-765794883524 --- .../MigrationTools/org/tianocore/migration/ModuleInfo.java | 6 ++---- .../org/tianocore/migration/SourceFileReplacer.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java index 3576578202..72d39bbd77 100644 --- 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; public Set localmodulesources = new HashSet(); //contains both .c and .h - public Set localmoduleheaders = new HashSet(); public Set preprocessedccodes = new HashSet(); public Set hashfuncc = new HashSet(); @@ -69,8 +68,7 @@ public class ModuleInfo { if (list[i].contains(".c") || list[i].contains(".C")) { localmodulesources.add(list[i]); } else if (list[i].contains(".h") || list[i].contains(".H")) { - localmodulesources.add(list[i]); - localmoduleheaders.add(list[i]); //the case that several .inf or .msa found is not concerned + localmodulesources.add(list[i]); //the case that several .inf or .msa found is not concerned } else if (list[i].contains(".dxs")) { localmodulesources.add(list[i]); } else if (list[i].contains(".uni")) { @@ -161,7 +159,7 @@ public class ModuleInfo { while ((line = rd.readLine()) != null) { if (line.contains("#include")) { mtcinclude = ptninclude.matcher(line); - if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) { + if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) { } else { line = migrationcomment + line; } diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java index c7e2fea3c0..6f56e51969 100644 --- 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)) { mi.localmodulesources.add("R8Lib.h"); mi.localmodulesources.add("R8Lib.c"); - mi.localmoduleheaders.add("R8Lib.h"); filer8only.add(r8thing); mi.hashr8only.add(r8thing); addr8 = true; -- 2.39.2