Fix EDKT138. And add active_platform file info for stand alone module build.

[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 88e1a20e5e93a2089219ee5fa371e702ce4e64d6..c5c51bed6bc2164a49c0d3a674f9c71174a0a05a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -26,7 +26,6 @@ import org.apache.tools.ant.Task;
 import org.tianocore.build.fpd.FpdParserTask;\r
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.toolchain.ConfigReader;\r
-import org.tianocore.build.toolchain.ToolChainConfig;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
 \r
 public class FrameworkBuildTask extends Task{\r
@@ -81,7 +80,6 @@ public class FrameworkBuildTask extends Task{
                 }\r
             }\r
         } catch (Exception e) {\r
-            e.printStackTrace();\r
             throw new BuildException(e.getMessage());\r
         }\r
         \r
@@ -155,6 +153,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
@@ -284,7 +284,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