diff options
| author | alfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-14 07:03:21 +0000 |
|---|---|---|
| committer | alfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-14 07:03:21 +0000 |
| commit | 03af6beba5f15564ff10aa1766f224c2f25a530a (patch) | |
| tree | 187a143e9a3ed5c9fda48e522530f454252c0883 /Tools | |
| parent | 88f858a1355fc338f8cc7e9a9246a8c0a98da10f (diff) | |
| download | edk2-03af6beba5f15564ff10aa1766f224c2f25a530a.zip edk2-03af6beba5f15564ff10aa1766f224c2f25a530a.tar.gz edk2-03af6beba5f15564ff10aa1766f224c2f25a530a.tar.bz2 | |
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java | 6 | ||||
| -rw-r--r-- | Tools/Source/MigrationTools/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 3576578..72d39bb 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<String> localmodulesources = new HashSet<String>(); //contains both .c and .h
- public Set<String> localmoduleheaders = new HashSet<String>();
public Set<String> preprocessedccodes = new HashSet<String>();
public Set<String> hashfuncc = new HashSet<String>();
@@ -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 c7e2fea..6f56e51 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;
|