X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFrameworkBuildTask.java;fp=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FFrameworkBuildTask.java;h=ea5657cdf9ec89ca0320f08e9a2ecb1e23aff1e8;hp=04cf84c04fea1a42b7679ef070c9a84729725646;hb=c8df018e44c9a88a582472339b645d4087848fd6;hpb=97fc032b57b1d189139df778272942d6eaeb132d diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java index 04cf84c04f..ea5657cdf9 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java +++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java @@ -26,10 +26,12 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Task; import org.tianocore.build.fpd.FpdParserForThread; import org.tianocore.build.fpd.FpdParserTask; +import org.tianocore.build.global.GenBuildLogger; import org.tianocore.build.global.GlobalData; import org.tianocore.build.toolchain.ConfigReader; import org.tianocore.build.toolchain.ToolChainInfo; import org.tianocore.common.definitions.ToolDefinitions; +import org.tianocore.common.logger.EdkLog; /**

@@ -103,6 +105,13 @@ public class FrameworkBuildTask extends Task{ private String type = "all"; public void execute() throws BuildException { + // + // set Logger + // + GenBuildLogger logger = new GenBuildLogger(getProject()); + EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL")); + EdkLog.setLogger(logger); + // // Seach build.xml -> .FPD -> .MSA file // @@ -200,7 +209,7 @@ public class FrameworkBuildTask extends Task{ fpdParserForThread.setType(type); fpdParserForThread.setProject(getProject()); fpdParserForThread.setFpdFile(buildFile); - fpdParserForThread.execute(); + fpdParserForThread.perform(); return ; } @@ -208,7 +217,7 @@ public class FrameworkBuildTask extends Task{ fpdParserTask.setType(type); fpdParserTask.setProject(getProject()); fpdParserTask.setFpdFile(buildFile); - fpdParserTask.execute(); + fpdParserTask.perform(); // // If cleanall delete the Platform_build.xml @@ -239,7 +248,7 @@ public class FrameworkBuildTask extends Task{ } genBuildTask.setProject(getProject()); genBuildTask.setMsaFile(buildFile); - genBuildTask.execute(); + genBuildTask.perform(); } } @@ -268,7 +277,6 @@ public class FrameworkBuildTask extends Task{ String name = (String)piter.next(); originalProperties.put(new String(name), new String((String)allProperties.get(name))); } - } private File intercommuniteWithUser(){ @@ -370,12 +378,12 @@ public class FrameworkBuildTask extends Task{ activePlatform = str; } - str = getValue("MULTIPLE_THREAD", targetFileInfo); + str = getValue(ToolDefinitions.TARGET_KEY_MULTIPLE_THREAD, targetFileInfo); if (str != null && str.trim().equalsIgnoreCase("Enable")) { multithread = true; } - str = getValue("MAX_CONCURRENT_THREAD_NUMBER", targetFileInfo); + str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo); if (str != null ) { try { int threadNum = Integer.parseInt(str);