X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ftoolchain%2FToolChainTask.java;h=4b0577bea3aa0302b1b59fcecd34c0372bfdd722;hb=a29c47e01d9689fad735bbeccfaef67676a425d1;hp=04dab1c3e37be35c88651ee66700d9d7f0de888e;hpb=9c39e214765666c7984f09074bfb7c7825df5c54;p=mirror_edk2.git diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java index 04dab1c3e3..4b0577bea3 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java +++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ToolChainTask.java @@ -15,6 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ package org.tianocore.build.toolchain; +import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; @@ -25,7 +27,13 @@ import org.apache.tools.ant.Task; @since GenBuild 1.0 **/ public class ToolChainTask extends Task{ - + /// + /// environment variable name of toolchain + /// + static private String toolsEnv = "env.TOOLS_DEF"; + /// + /// configuration file path + /// private String confPath = "."; /** @@ -43,10 +51,9 @@ public class ToolChainTask extends Task{ Config files are invalid. **/ public void execute() throws BuildException { - String toolChain = getProject().getProperty("env.TOOL_CHAIN"); - ToolChainFactory toolchain = new ToolChainFactory(confPath, toolChain); - toolchain.setupToolChain(); - getProject().setProperty("TARGET", toolchain.getCurrentTarget()); + String toolChain = getProject().getProperty(toolsEnv); +// ToolChainConfig toolchain = new ToolChainConfig(new File(confPath + File.separatorChar + toolChain)); + //getProject().setProperty("TARGET", toolchain.getCurrentTarget()); } /**