1) Changed ToolArg class to abstract generic arguments of a tool

2) Added FileArg class to abstract arguments which represent the path of a file
3) Changed the log method to EdkLog and the message format for flashmap, fwimage, gendepex, genfvimage, gensection, peirebase, strgather and vfrcompile tool. And changed these tools to use ToolArg and FileArg to keep their arguments.
4) Added more verbose message for OnDependency task
5) Changed MakeDeps tool to insert a file end flag. This is very useful when dependency check is broken occasionally
6) Cleaned the coding style of java code


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1519 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 1 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
index 6f845ea371..84383151fa 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import org.apache.tools.ant.BuildException;

 import org.apache.tools.ant.Task;

 import org.apache.tools.ant.taskdefs.Sequential;

+import org.tianocore.common.logger.EdkLog;

 

 /**

  Class OnDepdendency is used to check the timestamp between source files and

@@ -54,7 +55,7 @@ public class OnDependency extends Task {
     /**

      Standard execute method of ANT task

      **/

-    public void execute() {

+    public void execute() throws BuildException {

         if (isOutOfDate() && task != null) {

             task.perform();

         }

@@ -68,6 +69,7 @@ public class OnDependency extends Task {
         /// if no source files specified, take it as a fresh start

         ///

         if (sources.nameList.size() == 0) {

+            EdkLog.log(this, EdkLog.EDK_VERBOSE, "No source file spcified!");

             return true;

         }

 

@@ -76,6 +78,7 @@ public class OnDependency extends Task {
             String dstFileName = (String)dstIt.next();

             File dstFile = new File(dstFileName);

             if (!dstFile.exists()) {

+                EdkLog.log(this, EdkLog.EDK_VERBOSE, "Target file [" + dstFileName + "] doesn't exist!");

                 return true;

             }

 

@@ -97,6 +100,7 @@ public class OnDependency extends Task {
                 }

 

                 if (dstTimeStamp < srcTimeStamp) {

+                    EdkLog.log(this, EdkLog.EDK_VERBOSE, "Source file [" + srcFileName + "] has been changed since last build!");

                     return true;

                 }

             }