Added support for macro/property in tools_def.txt. Now you can define a property...

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / FrameworkBuildTask.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 84e799d00c63245f1f5fcb8cd628752165e08a9c..e240150c29c471bc42f1ce79686e42842d80f8d2 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -197,7 +197,7 @@ public class FrameworkBuildTask extends Task{
         //\r
         File workspacePath = new File(getProject().getProperty("WORKSPACE"));\r
         getProject().setProperty("WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/"));\r
-        GlobalData.initInfo(dbFilename, workspacePath.getPath(), toolsDefFilename);\r
+        GlobalData.initInfo(getProject(), dbFilename, workspacePath.getPath(), toolsDefFilename);\r
         \r
         //\r
         // If find MSA file and ACTIVE_PLATFORM is set, build the module; \r
@@ -333,7 +333,7 @@ public class FrameworkBuildTask extends Task{
     private void readTargetFile() throws EdkException{\r
         String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
         \r
-        String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
+        String[][] targetFileInfo = ConfigReader.parse(getProject(), targetFile);\r
         \r
         //\r
         // Get ToolChain Info from target.txt\r