Fixed EDKT102;

[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 f91002ace195995e14a32894826c639b91d0527e..286fd69490d5b4bb46d42358552a9cf78e131f0c 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
@@ -267,7 +265,7 @@ public class FrameworkBuildTask extends Task{
             else {\r
                 envToolChainInfo.addTargets(str);\r
             }\r
-            str = getValue("TAGNAME", targetFileInfo);\r
+            str = getValue("TOOL_CHAIN_TAG", targetFileInfo);\r
             if (str == null || str.trim().equals("")) {\r
                 envToolChainInfo.addTagnames("*");\r
             }\r
@@ -283,8 +281,8 @@ public class FrameworkBuildTask extends Task{
             }\r
             GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
             \r
-            str = getValue("TOOLS_DEFINITION_FILE", targetFileInfo);\r
-            if (str != null) {\r
+            str = getValue("TOOL_CHAIN_CONF", targetFileInfo);\r
+            if (str != null && str.trim().length() > 0) {\r
                 toolsDefFilename = str;\r
             }\r
             \r