diff options
author | jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-14 01:53:55 +0000 |
---|---|---|
committer | jwang36 <jwang36@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-08-14 01:53:55 +0000 |
commit | f496b9b5ce1dfdf5ee111c24de96529ee0c4708f (patch) | |
tree | 25a1dde534df41618ab889ecd89e448f981bdab0 | |
parent | 3b06f97c13b36be92dd85fcd62059fda42271fc5 (diff) | |
download | edk2-f496b9b5ce1dfdf5ee111c24de96529ee0c4708f.zip edk2-f496b9b5ce1dfdf5ee111c24de96529ee0c4708f.tar.gz edk2-f496b9b5ce1dfdf5ee111c24de96529ee0c4708f.tar.bz2 |
Tried to fix EDKT149. Since the issue happened randomly, only long time test can make sure it's really fixed.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1243 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java | 2 | ||||
-rw-r--r-- | Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java index 3a30488..c2865cb 100644 --- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java +++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java @@ -72,7 +72,7 @@ public class IncludePath implements NestElement { @param name The name of include path
**/
public void setName(String name){
- this.path = "-I " + name;
+ this.path = " -I " + name;
}
/**
diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java index 446bf0d..5c04977 100644 --- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java +++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java @@ -354,16 +354,12 @@ public class MakeDeps extends Task { //
String line = null;
while ((line = lineReader.readLine()) != null) {
- Pattern pattern = Pattern.compile(target + "[ ]*:[ ]*(.+)");
- Matcher matcher = pattern.matcher(line);
-
- while (matcher.find()) {
+ String[] filePath = line.split(" : ");
+ if (filePath.length == 2) {
///
/// keep the file name after ":"
///
- String filePath = line.substring(matcher.start(1), matcher.end(1));
- filePath = cleanupPathName(filePath);
- lineSet.add(filePath);
+ lineSet.add(cleanupPathName(filePath[1]));
}
}
lineReader.close();
|