logger.putMessage(null, EDK_INFO, message);\r
}\r
}\r
+ \r
+ public static void log(Object o, int level, String message) {\r
+ if (level <= logLevel) {\r
+ logger.putMessage(o, level, message);\r
+ }\r
+ }\r
+\r
+ public static void log(Object o, String message) {\r
+ if (EDK_INFO <= logLevel) {\r
+ logger.putMessage(o, EDK_INFO, message);\r
+ }\r
+ }\r
\r
public static void flushLogToFile(File file) {\r
logger.flushToFile(file);\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "createmtfile");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.outputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.outputFile)).getName());\r
revl = runner.execute();\r
\r
if (EFI_SUCCESS == revl) {\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "CreateMtFile succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "CreateMtFile succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("CreateMtFile failed!");\r
}\r
} catch (Exception e) {\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "eficompress");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "EfiCompress succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "EfiCompress succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("EfiCompress failed!");\r
\r
}\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "efirom");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
}\r
}\r
\r
- EdkLog.log(EdkLog.EDK_VERBOSE, argList.toString().replaceAll(",",""));\r
- EdkLog.log(EdkLog.EDK_INFO, " ");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, argList.toString().replaceAll(",",""));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, " ");\r
\r
//\r
// lauch the program\r
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "flashmap");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// log command line string.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, cmdProc.getOutputStream().toString());\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.flashDefFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, cmdProc.getOutputStream().toString());\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.flashDefFile)).getName());\r
if (exitCode != 0) {\r
int len = cmdOut.read(buf, 0, 1024);\r
- EdkLog.log(EdkLog.EDK_INFO, new String(buf, 0, len));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, new String(buf, 0, len));\r
} else {\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "FlashMap succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "FlashMap succeeded!");\r
}\r
} catch (Exception e) {\r
throw new BuildException(e.getMessage());\r
+++ /dev/null
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution. The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-Module Name:\r
- FrameworkLogger.java\r
-\r
-Abstract:\r
-\r
---*/\r
-\r
-package org.tianocore.framework.tasks;\r
-\r
-import org.apache.tools.ant.Project;\r
-import java.io.File;\r
-import org.tianocore.common.logger.LogMethod;\r
-\r
-class FrameworkLogger implements LogMethod {\r
- private Project project;\r
- private String titleName;\r
- public FrameworkLogger(Project project, String taskName) {\r
- this.project = project;\r
- this.titleName = taskName;\r
- }\r
-\r
- public void putMessage(Object msgSource, int msgLevel, String msg) {\r
- String frameworkMsg = " [" + this.titleName + "] " + msg;\r
- this.project.log(frameworkMsg, Project.MSG_INFO);\r
- }\r
- \r
- public void flushToFile(File file) {\r
- }\r
-}
\ No newline at end of file
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "genacpitable");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
revl = runner.execute();\r
\r
if (EFI_SUCCESS == revl) {\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "GenAcpiTable succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenAcpiTable succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("GenAcpiTable failed!");\r
}\r
} catch (Exception e) {\r
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "gencapsulehdr");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(scriptFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(scriptFile)).getName());\r
revl = runner.execute();\r
\r
if (EFI_SUCCESS == revl) {\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "GenCapsuleHdr succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenCapsuleHdr succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_ERROR, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("GenCapsuleHdr failed!");\r
}\r
} catch (Exception e) {\r
\r
String ffsSuffix = "";\r
String outputPath = "";\r
- Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "genFfs");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
\r
//\r
// Get Fraemwork_Tools_Path\r
FfsHeader ffsHeader = new FfsHeader(); \r
FfsHeader orgFfsHeader = new FfsHeader();\r
\r
- EdkLog.log(EdkLog.EDK_INFO, ffsFile.getName());\r
+ EdkLog.log(this, EdkLog.EDK_INFO, ffsFile.getName());\r
\r
try {\r
//\r
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "GenTeImage succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "GenTeImage succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
throw new BuildException("GenTeImage failed!");\r
}\r
} catch (Exception e) {\r
\r
import java.io.File;\r
import java.io.FileReader;\r
-import java.io.FileWriter;\r
import java.io.IOException;\r
import java.io.LineNumberReader;\r
import java.util.ArrayList;\r
-import java.util.HashSet;\r
import java.util.Iterator;\r
import java.util.List;\r
-import java.util.Set;\r
-import java.util.StringTokenizer;\r
\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Project;\r
\r
Project prj = this.getOwningTarget().getProject();\r
String toolPath = prj.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
- FrameworkLogger logger = new FrameworkLogger(prj, "makedeps");\r
- EdkLog.setLogLevel(prj.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
\r
///\r
/// compose full tool path\r
runner.setAntRun(prj);\r
runner.setCommandline(cmd.getCommandline());\r
\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmd.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmd.getCommandline()));\r
\r
int result = 0;\r
try {\r
}\r
\r
if (result != 0) {\r
- EdkLog.log(EdkLog.EDK_INFO, "MakeDeps failed!");\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "MakeDeps failed!");\r
throw new BuildException("MakeDeps: failed to generate dependency file!");\r
}\r
}\r
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "modifyinftask");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFVInfFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFVInfFile)).getName());\r
revl = runner.execute();\r
\r
if (EFI_SUCCESS == revl) {\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "ModifyInfTask succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "ModifyInfTask succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("ModifyInfTask failed!");\r
}\r
} catch (Exception e) {\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, toolName.toLowerCase());\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
\r
//\r
// absolute path of efi tools\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, this.inputFileName);\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, this.inputFileName);\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "PeiReBase succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "PeiReBase succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("PeiReBase failed!");\r
}\r
} catch (Exception e) {\r
\r
Project project = this.getOwningTarget().getProject();\r
//\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "secapresetvectorfixup");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
- //\r
// absolute path of efi tools\r
//\r
String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH");\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.fvInputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.fvInputFile)).getName());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "SecApResetVectorFixup succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "SecApResetVectorFixup succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("SecApResetVectorFixup failed!");\r
}\r
} catch (Exception e) {\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, toolName\r
- .toLowerCase());\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "SecFixup succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "SecFixup succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
throw new BuildException("SecFixup failed!");\r
}\r
} catch (Exception e) {\r
\r
Project project = this.getOwningTarget().getProject();\r
\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "splitfile");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
-\r
//\r
// absolute path of efi tools\r
//\r
runner.setAntRun(project);\r
runner.setCommandline(cmdline.getCommandline());\r
\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
revl = runner.execute();\r
if (EFI_SUCCESS == revl) {\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("SplitFile failed!");\r
}\r
} catch (Exception e) {\r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "strip");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.inputFile)).getName());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "Strip succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "Strip succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("Strip failed!");\r
}\r
} catch (Exception e) {\r
} else {\r
command = toolPath + "/" + "VfrCompile";\r
}\r
- List<Object> includePath = new ArrayList<Object>(); \r
String incPath = ""; \r
\r
int count = includepathList.size(); \r
public void execute() throws BuildException {\r
\r
Project project = this.getOwningTarget().getProject();\r
- //\r
- // set Logger\r
- //\r
- FrameworkLogger logger = new FrameworkLogger(project, "zerodebugdata");\r
- EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
- EdkLog.setLogger(logger);\r
+\r
//\r
// absolute path of efi tools\r
//\r
//\r
// Set debug log information.\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
- EdkLog.log(EdkLog.EDK_INFO, (new File(this.peFile)).getName());\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, Commandline.toString(cmdline.getCommandline()));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, (new File(this.peFile)).getName());\r
\r
revl = runner.execute();\r
\r
//\r
// command execution success\r
//\r
- EdkLog.log(EdkLog.EDK_VERBOSE, "ZeroDebugData succeeded!");\r
+ EdkLog.log(this, EdkLog.EDK_VERBOSE, "ZeroDebugData succeeded!");\r
} else {\r
//\r
// command execution fail\r
//\r
- EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
+ EdkLog.log(this, EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
throw new BuildException("ZeroDebugData failed!");\r
\r
}\r
import org.tianocore.build.global.SurfaceAreaQuery;\r
import org.tianocore.build.id.FpdModuleIdentification;\r
import org.tianocore.common.definitions.EdkDefinitions;\r
+import org.tianocore.common.logger.EdkLog;\r
import org.w3c.dom.Document;\r
import org.w3c.dom.Element;\r
\r
// Otherwise report warning message\r
//\r
if (buildType == null) {\r
- System.out.println("Warning: this module doesn't specify a FfsFormatKey. ");\r
+ EdkLog.log(EdkLog.EDK_WARNING, "Warning: this module doesn't specify a FfsFormatKey. ");\r
} else {\r
throw new BuildException("Can't find the FfsFormatKey [" + buildType + "] attribute in the FPD file!"); \r
}\r
\r
import java.io.BufferedReader;\r
import java.io.File;\r
+import java.io.IOException;\r
import java.io.InputStreamReader;\r
import java.util.Hashtable;\r
import java.util.Iterator;\r
\r
import org.apache.tools.ant.BuildException;\r
import org.apache.tools.ant.Task;\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.FpdParserForThread;\r
import org.tianocore.build.fpd.FpdParserTask;\r
import org.tianocore.build.global.GenBuildLogger;\r
import org.tianocore.build.toolchain.ConfigReader;\r
import org.tianocore.build.toolchain.ToolChainInfo;\r
import org.tianocore.common.definitions.ToolDefinitions;\r
+import org.tianocore.common.exception.EdkException;\r
import org.tianocore.common.logger.EdkLog;\r
\r
/**\r
private String type = "all";\r
\r
public void execute() throws BuildException {\r
+ try {\r
+ processFrameworkBuild();\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 processFrameworkBuild() throws EdkException, GenBuildException, AutoGenException, PcdAutogenException, PlatformPcdPreprocessBuildException {\r
//\r
// set Logger\r
//\r
}\r
}\r
}\r
- } catch (Exception e) {\r
+ } catch (IOException e) {\r
throw new BuildException(e.getMessage());\r
}\r
\r
// Build every FPD files (PLATFORM build)\r
//\r
if (buildFile.getName().endsWith(ToolDefinitions.FPD_EXTENSION)) {\r
- System.out.println("Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
+ EdkLog.log(this, "Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
//\r
// Iff for platform build will enable the multi-thread if set in target.txt\r
//\r
if (multithread && type.equalsIgnoreCase("all")) {\r
- System.out.println("Multi-thread build is enabled. ");\r
+ EdkLog.log(this, "Multi-thread build is enabled. ");\r
FpdParserForThread fpdParserForThread = new FpdParserForThread();\r
fpdParserForThread.setType(type);\r
fpdParserForThread.setProject(getProject());\r
//\r
else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {\r
File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
- System.out.println("Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
- System.out.println("Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
+ EdkLog.log(this, "Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
+ EdkLog.log(this, "Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
GenBuildTask genBuildTask = new GenBuildTask();\r
genBuildTask.setSingleModuleBuild(true);\r
genBuildTask.setType(type);\r
index++;\r
}\r
\r
- System.out.println("Finding " + allFiles.length + " FPD files: ");\r
+ EdkLog.log(this, "Finding " + allFiles.length + " FPD files: ");\r
for (int i = 0; i < allFiles.length; i++) {\r
System.out.println("[" + (i + 1) + "]: " + allFiles[i].getName());\r
}\r
\r
boolean flag = true;\r
- System.out.print("Please select one of the following FPD files to build:[1] ");\r
+ EdkLog.log(this, "Please select one of the following FPD files to build:[1] ");\r
do{\r
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));\r
try {\r
}\r
int indexSelect = Integer.parseInt(str);\r
if (indexSelect <=0 || indexSelect > allFiles.length) {\r
- System.out.print("Please enter a number between [1.." + allFiles.length + "]:[1] ");\r
+ EdkLog.log(this, "Please enter a number between [1.." + allFiles.length + "]:[1] ");\r
continue ;\r
} else {\r
file = allFiles[indexSelect - 1];\r
continue ;\r
}\r
} catch (Exception e) {\r
- System.out.print("Please enter a valid number:[1] ");\r
+ EdkLog.log(this, "Please enter a valid number:[1] ");\r
flag = true;\r
}\r
} while (flag);\r
}\r
}\r
\r
- private void readTargetFile(){\r
- try {\r
- String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
- \r
- String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
- \r
- //\r
- // Get ToolChain Info from target.txt\r
- //\r
- ToolChainInfo envToolChainInfo = new ToolChainInfo(); \r
- String str = getValue(ToolDefinitions.TARGET_KEY_TARGET, targetFileInfo);\r
- if (str == null || str.trim().equals("")) {\r
- envToolChainInfo.addTargets("*");\r
- } else {\r
- envToolChainInfo.addTargets(str);\r
- }\r
- str = getValue(ToolDefinitions.TARGET_KEY_TOOLCHAIN, targetFileInfo);\r
- if (str == null || str.trim().equals("")) {\r
- envToolChainInfo.addTagnames("*");\r
- } else {\r
- envToolChainInfo.addTagnames(str);\r
- }\r
- str = getValue(ToolDefinitions.TARGET_KEY_ARCH, targetFileInfo);\r
- if (str == null || str.trim().equals("")) {\r
- envToolChainInfo.addArchs("*");\r
- } else {\r
- envToolChainInfo.addArchs(str);\r
- }\r
- GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
- \r
- str = getValue(ToolDefinitions.TARGET_KEY_TOOLS_DEF, targetFileInfo);\r
- if (str != null && str.trim().length() > 0) {\r
- toolsDefFilename = str;\r
- }\r
- \r
- str = getValue(ToolDefinitions.TARGET_KEY_ACTIVE_PLATFORM, targetFileInfo);\r
- if (str != null && ! str.trim().equals("")) {\r
- if ( ! str.endsWith(".fpd")) {\r
- throw new BuildException("FPD file's extension must be \"" + ToolDefinitions.FPD_EXTENSION + "\"!");\r
- }\r
- activePlatform = str;\r
- }\r
- \r
- str = getValue(ToolDefinitions.TARGET_KEY_MULTIPLE_THREAD, targetFileInfo);\r
- if (str != null && str.trim().equalsIgnoreCase("Enable")) {\r
- multithread = true;\r
+ private void readTargetFile() throws EdkException{\r
+ String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
+ \r
+ String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
+ \r
+ //\r
+ // Get ToolChain Info from target.txt\r
+ //\r
+ ToolChainInfo envToolChainInfo = new ToolChainInfo(); \r
+ String str = getValue(ToolDefinitions.TARGET_KEY_TARGET, targetFileInfo);\r
+ if (str == null || str.trim().equals("")) {\r
+ envToolChainInfo.addTargets("*");\r
+ } else {\r
+ envToolChainInfo.addTargets(str);\r
+ }\r
+ str = getValue(ToolDefinitions.TARGET_KEY_TOOLCHAIN, targetFileInfo);\r
+ if (str == null || str.trim().equals("")) {\r
+ envToolChainInfo.addTagnames("*");\r
+ } else {\r
+ envToolChainInfo.addTagnames(str);\r
+ }\r
+ str = getValue(ToolDefinitions.TARGET_KEY_ARCH, targetFileInfo);\r
+ if (str == null || str.trim().equals("")) {\r
+ envToolChainInfo.addArchs("*");\r
+ } else {\r
+ envToolChainInfo.addArchs(str);\r
+ }\r
+ GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
+ \r
+ str = getValue(ToolDefinitions.TARGET_KEY_TOOLS_DEF, targetFileInfo);\r
+ if (str != null && str.trim().length() > 0) {\r
+ toolsDefFilename = str;\r
+ }\r
+ \r
+ str = getValue(ToolDefinitions.TARGET_KEY_ACTIVE_PLATFORM, targetFileInfo);\r
+ if (str != null && ! str.trim().equals("")) {\r
+ if ( ! str.endsWith(".fpd")) {\r
+ throw new BuildException("FPD file's extension must be \"" + ToolDefinitions.FPD_EXTENSION + "\"!");\r
}\r
+ activePlatform = str;\r
+ }\r
+ \r
+ str = getValue(ToolDefinitions.TARGET_KEY_MULTIPLE_THREAD, targetFileInfo);\r
+ if (str != null && str.trim().equalsIgnoreCase("Enable")) {\r
+ multithread = true;\r
+ }\r
\r
- str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
- if (str != null ) {\r
- try {\r
- int threadNum = Integer.parseInt(str);\r
- if (threadNum > 0) {\r
- MAX_CONCURRENT_THREAD_NUMBER = threadNum;\r
- }\r
- } catch (Exception enuma) {\r
- \r
+ str = getValue(ToolDefinitions.TARGET_KEY_MAX_CONCURRENT_THREAD_NUMBER, targetFileInfo);\r
+ if (str != null ) {\r
+ try {\r
+ int threadNum = Integer.parseInt(str);\r
+ if (threadNum > 0) {\r
+ MAX_CONCURRENT_THREAD_NUMBER = threadNum;\r
}\r
+ } catch (Exception enuma) {\r
}\r
}\r
- catch (Exception ex) {\r
- throw new BuildException(ex.getMessage());\r
- }\r
}\r
\r
private String getValue(String key, String[][] map) {\r
\r
import org.tianocore.common.definitions.ToolDefinitions;\r
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.fpd.FpdParserTask;\r
import org.tianocore.build.global.GlobalData;\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
// 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
+++ /dev/null
-/** @file\r
- EntityException class.\r
-\r
- The class handle the exception throwed by entity class.\r
- \r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution. The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
- \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-\r
-**/ \r
-package org.tianocore.build.exception;\r
-\r
-/**\r
- The class handle the exception throwed by entity class.\r
-**/\r
-public class EdkException extends Exception {\r
- static final long serialVersionUID = -8034897190740066938L;\r
- /**\r
- Constructure function\r
- \r
- @param expStr exception message string.\r
- **/\r
- public EdkException(String expStr) {\r
- super("[EdkException]:" + expStr);\r
- }\r
- \r
- public EdkException() {\r
- super();\r
- }\r
-}\r
-\r
root.appendChild(recursiveNode(childItem, document));\r
}\r
else if (childItem.getNodeType() == Node.TEXT_NODE){\r
- if ( ! childItem.getNodeValue().trim().equalsIgnoreCase("")) {\r
+ if (!childItem.getNodeValue().trim().equalsIgnoreCase("")) {\r
root.setTextContent(childItem.getNodeValue());\r
}\r
}\r
import java.util.Vector;\r
\r
import org.apache.tools.ant.Project;\r
+import org.apache.tools.ant.Task;\r
\r
import org.tianocore.common.logger.EdkLog;\r
import org.tianocore.common.logger.LogMethod;\r
//\r
switch (msgLevel) {\r
case EdkLog.EDK_ALWAYS:\r
- this.project.log(msg, Project.MSG_INFO);\r
+ log(msgSource, msg, Project.MSG_INFO);\r
break;\r
case EdkLog.EDK_ERROR:\r
if (flag) {\r
- this.project.log(msg, Project.MSG_ERR);\r
+ log(msgSource, msg, Project.MSG_ERR);\r
} else {\r
- this.project.log(msg, Project.MSG_ERR);\r
+ log(msgSource, msg, Project.MSG_ERR);\r
v.add(msg);\r
}\r
break;\r
case EdkLog.EDK_WARNING:\r
if (flag) {\r
- this.project.log(msg, Project.MSG_WARN);\r
+ log(msgSource, msg, Project.MSG_WARN);\r
} else {\r
v.add(msg);\r
}\r
break;\r
case EdkLog.EDK_INFO:\r
if (flag) {\r
- this.project.log(msg, Project.MSG_INFO);\r
+ log(msgSource, msg, Project.MSG_INFO);\r
} else {\r
v.add(msg);\r
}\r
break;\r
case EdkLog.EDK_VERBOSE:\r
if (flag) {\r
- this.project.log(msg, Project.MSG_VERBOSE);\r
+ log(msgSource, msg, Project.MSG_VERBOSE);\r
} else {\r
v.add(msg);\r
}\r
break;\r
case EdkLog.EDK_DEBUG:\r
if (flag) {\r
- this.project.log(msg, Project.MSG_DEBUG);\r
+ log(msgSource, msg, Project.MSG_DEBUG);\r
} else {\r
v.add(msg);\r
}\r
//\r
\r
}\r
+ \r
+ private void log(Object msgSource, String msg, int level) {\r
+ if (msgSource instanceof Task) {\r
+ this.project.log((Task)msgSource, msg, level);\r
+ } else {\r
+ this.project.log(msg, level);\r
+ }\r
+ }\r
}
\ No newline at end of file
// CONF dir + tools definition file name\r
//\r
File toolsDefFile = new File(workspaceDir + File.separatorChar + toolsDefFilename);\r
- System.out.println("Using tool definiton file [" + toolsDefFile.getPath() + "].");\r
+ EdkLog.log("Using tool definiton file [" + toolsDefFile.getPath() + "].");\r
try {\r
toolsDef = new ToolChainConfig(toolsDefFile);\r
} catch (Exception e) {\r
}\r
toolChainInfo.addCommands(toolsDef.getConfigInfo().getCommands());\r
toolChainInfo.normalize();\r
- System.out.println("Current build tool chain information summary: ");\r
- System.out.println(toolChainInfo + "");\r
+ EdkLog.log("Current build tool chain information summary: ");\r
+ EdkLog.log(toolChainInfo + "");\r
}\r
return toolChainInfo;\r
}\r