1) Add FileTimeStamp class to centralize the cache mechanism for file time stamp...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / OnDependency.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
index 173528ab392f97b422572c56af12415514f43e8e..fbffb3bcb77490e55b1fe4c029339029c42e46aa 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OnDependency.java
@@ -22,6 +22,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;\r
 import org.apache.tools.ant.taskdefs.Sequential;\r
 import org.tianocore.common.logger.EdkLog;\r
+import org.tianocore.common.cache.FileTimeStamp;\r
 \r
 /**\r
  Class OnDepdendency is used to check the timestamp between source files and\r
@@ -29,26 +30,24 @@ import org.tianocore.common.logger.EdkLog;
  be re-generated from source files.\r
  **/\r
 public class OnDependency extends Task {\r
-    ///\r
-    /// cache the modified timestamp of files accessed, to speed up the depencey check\r
-    /// \r
-    private Map<String, Long> timeStampCache = new HashMap<String, Long>();\r
-    ///\r
-    /// source files list\r
-    ///\r
+    //\r
+    // source files list\r
+    //\r
     private DpFileList sources = null;\r
-    ///\r
-    /// target files list\r
-    ///\r
+\r
+    //\r
+    // target files list\r
+    //\r
     private DpFileList targets = null;\r
-    ///\r
-    /// tasks to be performed to generate target files\r
-    ///\r
+\r
+    //\r
+    // tasks to be performed to generate target files\r
+    //\r
     private Sequential  task = null;\r
 \r
-    ///\r
-    /// An empty constructor for an ANT task can avoid some potential issues\r
-    ///\r
+    /**\r
+     An empty constructor for an ANT task can avoid some potential issues\r
+     **/\r
     public OnDependency(){\r
     }\r
 \r
@@ -59,11 +58,18 @@ public class OnDependency extends Task {
         if (isOutOfDate() && task != null) {\r
             task.perform();\r
         }\r
+\r
+        //\r
+        // Update the time stamp of target files since they are just re-generated\r
+        // \r
+        for (Iterator dstIt = targets.nameList.iterator(); dstIt.hasNext();) {\r
+            FileTimeStamp.update((String)dstIt.next());\r
+        }\r
     }\r
 \r
-    ///\r
-    /// check if the target files are outofdate\r
-    ///\r
+    //\r
+    // check if the target files are outofdate\r
+    //\r
     private boolean isOutOfDate() {\r
         ///\r
         /// if no source files specified, take it as a fresh start\r
@@ -87,21 +93,17 @@ public class OnDependency extends Task {
                 return true;\r
             }\r
 \r
-            long dstTimeStamp = dstFile.lastModified();\r
+            long dstTimeStamp = FileTimeStamp.get(dstFileName);\r
             Iterator srcIt = sources.nameList.iterator();\r
             while (srcIt.hasNext()) {\r
                 String srcFileName = (String)srcIt.next();\r
-                long srcTimeStamp;\r
-\r
-                if (timeStampCache.containsKey(srcFileName)) {\r
-                    srcTimeStamp = ((Long)timeStampCache.get(srcFileName)).longValue();\r
-                } else {\r
-                    File srcFile = new File(srcFileName);\r
-                    if (!srcFile.exists()) {\r
-                        throw new BuildException("Source File name: " + srcFileName + " doesn't exist!!!");\r
-                    }\r
-                    srcTimeStamp = srcFile.lastModified();\r
-                    timeStampCache.put(srcFileName, new Long(srcTimeStamp));\r
+                long srcTimeStamp = FileTimeStamp.get(srcFileName);\r
+\r
+                if (srcTimeStamp == 0) {\r
+                    //\r
+                    // time stamp 0 means that the file doesn't exist\r
+                    // \r
+                    throw new BuildException("Source File name: " + srcFileName + " doesn't exist!!!");\r
                 }\r
 \r
                 if (dstTimeStamp < srcTimeStamp) {\r