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

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index f09becbad0a28d79e830e0560615fe3939e19de6..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
+        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
-                            getProject().getProperty("WORKSPACE_DIR"), toolsDefFilename);\r
+                workspacePath.getPath(), toolsDefFilename);\r
         \r
 \r
         \r
@@ -153,6 +155,8 @@ public class FrameworkBuildTask extends Task{
         // Build every MSA files (SINGLE MODULE BUILD)\r
         //\r
         else if (buildFile.getName().endsWith(".msa")) {\r
+            File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
+            System.out.println("Using FPD file [" + tmpFile.getPath() + "] as active platform. ");\r
             System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> ");\r
             GenBuildTask genBuildTask = new GenBuildTask();\r
             genBuildTask.setSingleModuleBuild(true);\r
@@ -282,7 +286,7 @@ public class FrameworkBuildTask extends Task{
             GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
             \r
             str = getValue("TOOL_CHAIN_CONF", targetFileInfo);\r
-            if (str != null) {\r
+            if (str != null && str.trim().length() > 0) {\r
                 toolsDefFilename = str;\r
             }\r
             \r