tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1253 6f19259b-4bc3-4df7-8a09-765794883524

This commit is contained in:
alfred 2006-08-14 07:03:21 +00:00
parent 88f858a135
commit 03af6beba5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
View File

@ -38,7 +38,6 @@ public class ModuleInfo {
public String entrypoint = null; public String entrypoint = null;
public Set<String> localmodulesources = new HashSet<String>(); //contains both .c and .h 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> preprocessedccodes = new HashSet<String>();
public Set<String> hashfuncc = 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")) { if (list[i].contains(".c") || list[i].contains(".C")) {
localmodulesources.add(list[i]); localmodulesources.add(list[i]);
} else if (list[i].contains(".h") || list[i].contains(".H")) { } else if (list[i].contains(".h") || list[i].contains(".H")) {
localmodulesources.add(list[i]); localmodulesources.add(list[i]); //the case that several .inf or .msa found is not concerned
localmoduleheaders.add(list[i]); //the case that several .inf or .msa found is not concerned
} else if (list[i].contains(".dxs")) { } else if (list[i].contains(".dxs")) {
localmodulesources.add(list[i]); localmodulesources.add(list[i]);
} else if (list[i].contains(".uni")) { } else if (list[i].contains(".uni")) {
@ -161,7 +159,7 @@ public class ModuleInfo {
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
if (line.contains("#include")) { if (line.contains("#include")) {
mtcinclude = ptninclude.matcher(line); mtcinclude = ptninclude.matcher(line);
if (mtcinclude.find() && localmoduleheaders.contains(mtcinclude.group(1))) { if (mtcinclude.find() && localmodulesources.contains(mtcinclude.group(1))) {
} else { } else {
line = migrationcomment + line; line = migrationcomment + line;
} }

1
Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
View File

@ -216,7 +216,6 @@ public class SourceFileReplacer {
if (r8only.contains(temp.r8thing)) { if (r8only.contains(temp.r8thing)) {
mi.localmodulesources.add("R8Lib.h"); mi.localmodulesources.add("R8Lib.h");
mi.localmodulesources.add("R8Lib.c"); mi.localmodulesources.add("R8Lib.c");
mi.localmoduleheaders.add("R8Lib.h");
filer8only.add(r8thing); filer8only.add(r8thing);
mi.hashr8only.add(r8thing); mi.hashr8only.add(r8thing);
addr8 = true; addr8 = true;