Fix T105. It is caused by cpptasks which change automati cally root directory like...

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
index 28ebfc8d355208ae2f4f1d0c2d0ece2ff57c2d64..32b94d8225fbd63f2756eaa98660106c285d16e9 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FileProcess.java
@@ -262,7 +262,7 @@ public class FileProcess {
         Element includesEle = document.createElement("EXTRA.INC");\r
         for (int i = 0; i < includePaths.length; i++) {\r
             Element includeEle = document.createElement("includepath");\r
         Element includesEle = document.createElement("EXTRA.INC");\r
         for (int i = 0; i < includePaths.length; i++) {\r
             Element includeEle = document.createElement("includepath");\r

-            includeEle.setAttribute("path", includePaths[i]);\r
+            includeEle.setAttribute("path", project.replaceProperties(includePaths[i]));\r

             includesEle.appendChild(includeEle);\r
         }\r
         ele.appendChild(includesEle);\r
             includesEle.appendChild(includeEle);\r
         }\r
         ele.appendChild(includesEle);\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index c5c51bed6bc2164a49c0d3a674f9c71174a0a05a..b2c3e15f00dc95396a36fa7c352045c079b5337e 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -96,8 +96,10 @@ public class FrameworkBuildTask extends Task{
         //\r
         // Global Data initialization\r
         //\r
         //\r
         // Global Data initialization\r
         //\r

+        File workspacePath = new File(getProject().getProperty("WORKSPACE"));\r
+        getProject().setProperty("WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/"));\r

         GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db",\r
         GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db",\r

-                            getProject().getProperty("WORKSPACE_DIR"), toolsDefFilename);\r
+                workspacePath.getPath(), toolsDefFilename);\r

         \r
 \r
         \r
         \r
 \r
         \r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
index 3e775e514edad9b8304d20cf6d05708647ed20b8..e9e2770957350119afa2f01be65cb6558b6f2ce2 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/ModuleBuildFileGenerator.java
@@ -435,7 +435,7 @@ public class ModuleBuildFileGenerator {
         //\r
         // WORKSPACE\r
         //\r
         //\r
         // WORKSPACE\r
         //\r

-        includes.add("${WORKSPACE_DIR}");\r
+        includes.add("${WORKSPACE_DIR}" + File.separatorChar);\r

         \r
         //\r
         // Module iteself\r
         \r
         //\r
         // Module iteself\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java b/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
index 530ecedc86aefde61b6824a9ce68b588618825a7..39a13d92d60c7c5ba388fa7b5185319fb365e732 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/id/PlatformIdentification.java
@@ -51,10 +51,10 @@ public class PlatformIdentification extends Identification{
     }\r
     \r
     public String getRelativeFpdFile (){\r
     }\r
     \r
     public String getRelativeFpdFile (){\r

-        return fpdFile.getPath().substring(GlobalData.getWorkspacePath().length());\r
+        return fpdFile.getPath().substring(GlobalData.getWorkspacePath().length() + 1);\r

     }\r
     \r
     public String getPlatformRelativeDir(){\r
     }\r
     \r
     public String getPlatformRelativeDir(){\r

-        return fpdFile.getParent().substring(GlobalData.getWorkspacePath().length());\r
+        return fpdFile.getParent().substring(GlobalData.getWorkspacePath().length() + 1);\r

     }\r
 }
\ No newline at end of file
     }\r
 }
\ No newline at end of file