tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto close multi-thread flag when stand-alone module build. Also change some logs. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1526 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
wuyizhong 2006-09-13 07:02:50 +00:00
parent 9f98dbb76f
commit d3945b9d4c
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
View File

@ -275,6 +275,7 @@ public class FrameworkBuildTask extends Task{
// Build every MSA files (SINGLE MODULE BUILD) // Build every MSA files (SINGLE MODULE BUILD)
// //
else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) { else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {
multithread = false;
File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform); File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);
EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. "); EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");
EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> "); EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> ");

15
Tools/Source/GenBuild/org/tianocore/build/GenBuildTask.java
View File

@ -35,7 +35,6 @@ import org.apache.xmlbeans.XmlObject;
import org.tianocore.common.definitions.ToolDefinitions; import org.tianocore.common.definitions.ToolDefinitions;
import org.tianocore.common.exception.EdkException; import org.tianocore.common.exception.EdkException;
import org.tianocore.common.logger.EdkLog;
import org.tianocore.build.autogen.AutoGen; import org.tianocore.build.autogen.AutoGen;
import org.tianocore.build.exception.AutoGenException; import org.tianocore.build.exception.AutoGenException;
import org.tianocore.build.exception.GenBuildException; import org.tianocore.build.exception.GenBuildException;
@ -270,7 +269,7 @@ public class GenBuildTask extends Ant {
// Whether the module is built before // Whether the module is built before
// //
if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) { if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {
EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n"); getProject().log(this, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n", Project.MSG_WARN);
continue; continue;
} else if (GlobalData.isModuleBuilt(fpdModuleId)) { } else if (GlobalData.isModuleBuilt(fpdModuleId)) {
break; break;
@ -295,7 +294,7 @@ public class GenBuildTask extends Ant {
// don't do anything if no tools found // don't do anything if no tools found
// //
if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) { if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {
EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: No build issued. No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n"); getProject().log(this, "Warning: No build issued. No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n", Project.MSG_WARN);
continue; continue;
} }
@ -305,8 +304,8 @@ public class GenBuildTask extends Ant {
// //
getProject().setProperty("TOOLCHAIN", toolchainList[j]); getProject().setProperty("TOOLCHAIN", toolchainList[j]);
EdkLog.log(this, "Build " + moduleId + " start >>>"); getProject().log(this, "Build " + moduleId + " start >>>", Project.MSG_INFO);
EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]); getProject().log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k], Project.MSG_INFO);
saq.push(GlobalData.getDoc(fpdModuleId)); saq.push(GlobalData.getDoc(fpdModuleId));
// //
@ -615,7 +614,7 @@ public class GenBuildTask extends Ant {
// then call the exist BaseName_build.xml directly. // then call the exist BaseName_build.xml directly.
// //
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) { if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {
EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml"); getProject().log(this, "Call user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml"; String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";
antCall(antFilename, null); antCall(antFilename, null);
@ -645,7 +644,7 @@ public class GenBuildTask extends Ant {
// then call the exist BaseName_build.xml directly. // then call the exist BaseName_build.xml directly.
// //
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) { if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {
EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml"); getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml"; String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";
antCall(antFilename, "clean"); antCall(antFilename, "clean");
@ -663,7 +662,7 @@ public class GenBuildTask extends Ant {
// then call the exist BaseName_build.xml directly. // then call the exist BaseName_build.xml directly.
// //
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) { if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {
EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml"); getProject().log(this, "Calling user-defined " + moduleId.getName() + "_build.xml", Project.MSG_INFO);
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml"; String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";
antCall(antFilename, "cleanall"); antCall(antFilename, "cleanall");

2
Tools/Source/GenBuild/org/tianocore/build/GenBuildThread.java
View File

@ -152,7 +152,7 @@ public class GenBuildThread implements Runnable {
genBuildTask.parentId = parentModuleId; genBuildTask.parentId = parentModuleId;
genBuildTask.execute(); genBuildTask.perform();
} catch (BuildException be) { } catch (BuildException be) {
EdkLog.log("GenBuild", EdkLog.EDK_ALWAYS, moduleId + " with Arch " + arch +" build error. \n" + be.getMessage()); EdkLog.log("GenBuild", EdkLog.EDK_ALWAYS, moduleId + " with Arch " + arch +" build error. \n" + be.getMessage());

4
Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
View File

@ -34,15 +34,15 @@ import java.util.Set;
import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildException;
import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlObject;
import org.tianocore.build.exception.*; import org.tianocore.build.exception.AutoGenException;
import org.tianocore.build.global.GlobalData; import org.tianocore.build.global.GlobalData;
import org.tianocore.build.global.SurfaceAreaQuery; import org.tianocore.build.global.SurfaceAreaQuery;
import org.tianocore.build.id.ModuleIdentification; import org.tianocore.build.id.ModuleIdentification;
import org.tianocore.build.id.PackageIdentification; import org.tianocore.build.id.PackageIdentification;
import org.tianocore.build.pcd.action.PCDAutoGenAction; import org.tianocore.build.pcd.action.PCDAutoGenAction;
import org.tianocore.common.logger.EdkLog;
import org.tianocore.common.definitions.ToolDefinitions; import org.tianocore.common.definitions.ToolDefinitions;
import org.tianocore.common.exception.EdkException; import org.tianocore.common.exception.EdkException;
import org.tianocore.common.logger.EdkLog;
/** /**
This class is to generate Autogen.h and Autogen.c according to module surface This class is to generate Autogen.h and Autogen.c according to module surface

1
Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
View File

@ -165,7 +165,6 @@ public class GlobalData {
EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Using tool definition file [" + toolsDefFile.getPath() + "]."); EdkLog.log("Init", EdkLog.EDK_ALWAYS, "Using tool definition file [" + toolsDefFile.getPath() + "].");
toolsDef = new ToolChainConfig(toolsDefFile); toolsDef = new ToolChainConfig(toolsDefFile);
// //
// Parse Framework Database // Parse Framework Database
// //