import org.tianocore.common.exception.EdkException;\r
import org.tianocore.common.logger.EdkLog;\r
import org.tianocore.build.autogen.AutoGen;\r
+import org.tianocore.build.exception.AutoGenException;\r
+import org.tianocore.build.exception.GenBuildException;\r
+import org.tianocore.build.exception.PcdAutogenException;\r
+import org.tianocore.build.exception.PlatformPcdPreprocessBuildException;\r
import org.tianocore.build.fpd.FpdParserTask;\r
-import org.tianocore.build.global.GenBuildLogger;\r
import org.tianocore.build.global.GlobalData;\r
import org.tianocore.build.global.OutputManager;\r
import org.tianocore.build.global.SurfaceAreaQuery;\r
From module build, exception from module surface area invalid.\r
**/\r
public void execute() throws BuildException {\r
+ this.setTaskName("GenBuild");\r
+ try {\r
+ processGenBuild();\r
+ } catch (PcdAutogenException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (AutoGenException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (PlatformPcdPreprocessBuildException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (GenBuildException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ } catch (EdkException e) {\r
+ //\r
+ // Add more logic process here\r
+ //\r
+ throw new BuildException(e.getMessage());\r
+ }\r
+ }\r
+\r
+ private void processGenBuild() throws EdkException, BuildException, GenBuildException, AutoGenException, PcdAutogenException, PlatformPcdPreprocessBuildException {\r
if (!FrameworkBuildTask.multithread) {\r
cleanupProperties();\r
}\r
- \r
- //\r
- // set Logger\r
- //\r
- GenBuildLogger logger = new GenBuildLogger(getProject());\r
- EdkLog.setLogLevel(getProject().getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
\r
//\r
// Enable all specified properties\r
String moduleVersion = getProject().getProperty("MODULE_VERSION");\r
String packageGuid = getProject().getProperty("PACKAGE_GUID");\r
String packageVersion = getProject().getProperty("PACKAGE_VERSION");\r
+ //\r
+ // If one of module Guid or package Guid is not specified, report error\r
+ //\r
if (moduleGuid == null || packageGuid == null) {\r
throw new BuildException("GenBuild parameter error.");\r
}\r
+ \r
PackageIdentification packageId = new PackageIdentification(packageGuid, packageVersion);\r
+ GlobalData.refreshPackageIdentification(packageId);\r
moduleId = new ModuleIdentification(moduleGuid, moduleVersion);\r
moduleId.setPackage(packageId);\r
+ GlobalData.refreshModuleIdentification(moduleId);\r
Map<String, XmlObject> doc = GlobalData.getNativeMsa(moduleId);\r
saq = new SurfaceAreaQuery(doc);\r
- moduleId = saq.getMsaHeader();\r
} else {\r
Map<String, XmlObject> doc = GlobalData.getNativeMsa(msaFile);\r
saq = new SurfaceAreaQuery(doc);\r
moduleId = saq.getMsaHeader();\r
+ moduleId.setMsaFile(msaFile);\r
}\r
+ \r
String[] producedLibraryClasses = saq.getLibraryClasses("ALWAYS_PRODUCED",null);\r
if (producedLibraryClasses.length == 0) {\r
moduleId.setLibrary(false);\r
// Single Module build\r
//\r
prepareSingleModuleBuild();\r
- } else {\r
- String packageGuid = getProject().getProperty("PACKAGE_GUID");\r
- String packageVersion = getProject().getProperty("PACKAGE_VERSION");\r
- PackageIdentification packageId = new PackageIdentification(packageGuid, packageVersion);\r
- moduleId.setPackage(packageId);\r
}\r
\r
//\r
// Whether the module is built before\r
//\r
if (moduleId.isLibrary() == false && GlobalData.hasFpdModuleSA(fpdModuleId) == false) {\r
- System.out.println("\nWARNING: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
+ EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " for " + archList[k] + " was not found in current platform FPD file!\n");\r
continue;\r
} else if (GlobalData.isModuleBuilt(fpdModuleId)) {\r
break;\r
// don't do anything if no tools found\r
//\r
if (GlobalData.isCommandSet(targetList[i], toolchainList[j], archList[k]) == false) {\r
- System.out.println("Warning: No build issued. No tools were found for [target=" + targetList[i] + " toolchain=" + toolchainList[j] + " arch=" + archList[k] + "]\n");\r
+ 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");\r
continue;\r
}\r
\r
//\r
getProject().setProperty("TOOLCHAIN", toolchainList[j]);\r
\r
- System.out.println("Build " + moduleId + " start >>>");\r
- System.out.println("Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
+ EdkLog.log(this, "Build " + moduleId + " start >>>");\r
+ EdkLog.log(this, "Target: " + targetList[i] + " Tagname: " + toolchainList[j] + " Arch: " + archList[k]);\r
saq.push(GlobalData.getDoc(fpdModuleId));\r
\r
//\r
Database must be unique. </p>\r
\r
**/\r
- private void prepareSingleModuleBuild(){\r
+ private void prepareSingleModuleBuild() throws EdkException {\r
//\r
// Find out the package which the module belongs to\r
- // TBD: Enhance it!!!!\r
//\r
PackageIdentification packageId = GlobalData.getPackageForModule(moduleId);\r
-\r
+ GlobalData.refreshPackageIdentification(packageId);\r
moduleId.setPackage(packageId);\r
+ GlobalData.refreshModuleIdentification(moduleId);\r
\r
//\r
// Read ACTIVE_PLATFORM's FPD file \r
//\r
key[4] = ToolDefinitions.TOOLS_DEF_ATTRIBUTE_FLAGS;\r
String cmdFlags = GlobalData.getCommandSetting(key, fpdModuleId);\r
- Set<String> addset = new LinkedHashSet<String>();\r
- Set<String> subset = new LinkedHashSet<String>();\r
- putFlagsToSet(addset, cmdFlags);\r
- getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
+ if (cmdFlags != null) \r
+ {\r
+// Set<String> addset = new LinkedHashSet<String>();\r
+// Set<String> subset = new LinkedHashSet<String>();\r
+// putFlagsToSet(addset, cmdFlags);\r
+// getProject().setProperty(cmd[m] + "_FLAGS", getProject().replaceProperties(getFlags(addset, subset)));\r
+ getProject().setProperty(cmd[m] + "_FLAGS", cmdFlags);\r
+ } \r
+ else \r
+ {\r
+ getProject().setProperty(cmd[m] + "_FLAGS", "");\r
+ }\r
+\r
\r
//\r
// Set CC_EXT\r
this.type = type;\r
}\r
\r
- private void applyBuild(String buildTarget, String buildTagname, FpdModuleIdentification fpdModuleId) throws BuildException{\r
+ private void applyBuild(String buildTarget, String buildTagname, FpdModuleIdentification fpdModuleId) throws EdkException {\r
//\r
// Call AutoGen to generate AutoGen.c and AutoGen.h\r
//\r
- AutoGen autogen = new AutoGen(getProject().getProperty("FV_DIR"), getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch(), saq);\r
+ AutoGen autogen = new AutoGen(getProject().getProperty("FV_DIR"), getProject().getProperty("DEST_DIR_DEBUG"), fpdModuleId.getModule(),fpdModuleId.getArch(), saq, parentId);\r
autogen.genAutogen();\r
\r
//\r
ModuleIdentification[] libinstances = saq.getLibraryInstance(fpdModuleId.getArch());\r
String propertyLibs = "";\r
for (int i = 0; i < libinstances.length; i++) {\r
- propertyLibs += " " + getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib";\r
+ propertyLibs += getProject().getProperty("BIN_DIR") + File.separatorChar + libinstances[i].getName() + ".lib" + " ";\r
}\r
getProject().setProperty("LIBS", propertyLibs.replaceAll("(\\\\)", "/"));\r
\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Call user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Call user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, null);\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, "clean");\r
// then call the exist BaseName_build.xml directly.\r
//\r
if (moduleId.getModuleType().equalsIgnoreCase("USER_DEFINED")) {\r
- System.out.println("Calling user-defined " + moduleId.getName() + "_build.xml");\r
+ EdkLog.log(this, "Calling user-defined " + moduleId.getName() + "_build.xml");\r
\r
String antFilename = getProject().getProperty("MODULE_DIR") + File.separatorChar + moduleId.getName() + "_build.xml";\r
antCall(antFilename, "cleanall");\r
this.isSingleModuleBuild = isSingleModuleBuild;\r
}\r
\r
- private String[] prepareIncludePaths(FpdModuleIdentification fpdModuleId) {\r
+ private String[] prepareIncludePaths(FpdModuleIdentification fpdModuleId) throws EdkException{\r
//\r
// Prepare the includes: PackageDependencies and Output debug direactory\r
//\r