Tried to fix EDKT149. Since the issue happened randomly, only long time test can...

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

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/IncludePath.java
index 3a30488cea70c2520caa270e6024efd04ded6eb6..c2865cb907a2cd2320762e746d0fb021da7b8f5e 100644 (file)
--- 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\r
      **/\r
     public void setName(String name){\r
-        this.path = "-I " + name;\r
+        this.path = " -I " + name;\r
     }\r
 \r
     /**\r

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 446bf0d0120de5d6b9823ab5344ffc86a485d4a8..5c049773b29e0e161cb8319e4100f86424aa4d64 100644 (file)
--- 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 {
             //\r
             String line = null;\r
             while ((line = lineReader.readLine()) != null) {\r
-                Pattern pattern = Pattern.compile(target + "[ ]*:[ ]*(.+)");\r
-                Matcher matcher = pattern.matcher(line);\r
-\r
-                while (matcher.find()) {\r
+                String[] filePath = line.split(" : ");\r
+                if (filePath.length == 2) {\r
                     ///\r
                     /// keep the file name after ":"\r
                     ///\r
-                    String filePath = line.substring(matcher.start(1), matcher.end(1));\r
-                    filePath = cleanupPathName(filePath);\r
-                    lineSet.add(filePath);\r
+                    lineSet.add(cleanupPathName(filePath[1]));\r
                 }\r
             }\r
             lineReader.close();\r