Fix Bug 15663: update-webkit re-downloads WebKitAuxiliaryLibrary unnecessarily

         http://bugs.webkit.org/show_bug.cgi?id=15663

         Added a fuzz factor into the Last-Modified comparison for downloading
         WebKitAuxiliaryLibrary.zip.

         The zip file is served from a set of mirrors who give Last-Modified
         times that are off by 1-3 seconds from each other. This was causing
         the build bots to redownload WebKitAuxiliaryLibrary for every build,
         which would then cause all of WebCore to rebuild each time.

         Reviewed by Mark.

         * Scripts/update-webkit-auxiliary-libs: Check if the new zip file is
         at least 30 seconds newer than the old one -- otherwise we assume that
         the difference in time is due to the mirrors being slightly offset
         from each other.
         (sub lastModifiedToUnixTime): Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9d98d190b1417e3e153ca42b113aa343ea58f6a0..7c2c9fce8b8c408e411108be09a825afae445137 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,25 @@
+2008-01-03  Adam Roben  <aroben@apple.com>
+
+        Fix Bug 15663: update-webkit re-downloads WebKitAuxiliaryLibrary unnecessarily
+
+        http://bugs.webkit.org/show_bug.cgi?id=15663
+
+        Added a fuzz factor into the Last-Modified comparison for downloading
+        WebKitAuxiliaryLibrary.zip.
+
+        The zip file is served from a set of mirrors who give Last-Modified
+        times that are off by 1-3 seconds from each other. This was causing
+        the build bots to redownload WebKitAuxiliaryLibrary for every build,
+        which would then cause all of WebCore to rebuild each time.
+
+        Reviewed by Mark.
+
+        * Scripts/update-webkit-auxiliary-libs: Check if the new zip file is
+        at least 30 seconds newer than the old one -- otherwise we assume that
+        the difference in time is due to the mirrors being slightly offset
+        from each other.
+        (sub lastModifiedToUnixTime): Added.
+
 2008-01-03  Alexey Proskuryakov  <ap@webkit.org>
 
         Windows build fix.

diff --git a/WebKitTools/Scripts/update-webkit-auxiliary-libs b/WebKitTools/Scripts/update-webkit-auxiliary-libs
index 7d9e91d4a98012fd33e8e068803c0808f37de6df..a4c86d5b5c0d1f4b3639cbfe5de542228394bfff 100755 (executable)
--- a/WebKitTools/Scripts/update-webkit-auxiliary-libs
+++ b/WebKitTools/Scripts/update-webkit-auxiliary-libs
@@ -31,6 +31,7 @@
 use strict;
 use warnings;
 
+use Date::Parse qw(str2time);
 use File::Find;
 use File::Temp;
 use File::Spec;
@@ -38,6 +39,15 @@ use FindBin;
 use lib $FindBin::Bin;
 use webkitdirs;
 
+sub lastModifiedToUnixTime($);
+
+# Time in seconds that the new zip file must be newer than the old for us to
+# consider them to be different. If the difference in modification time is less
+# than this threshold, we assume that the files are the same. We need this
+# because the zip file is served from a set of mirrors with slightly different
+# Last-Modified times.
+my $newnessThreshold = 30;
+
 my $sourceDir = sourceDir();
 my $file = "WebKitAuxiliaryLibrary";
 my $zipFile = "$file.zip"; 
@@ -51,13 +61,13 @@ my $result = system "curl -s -I $auxiliaryLibsURL | grep Last-Modified > \"$tmpD
 print STDERR "Couldn't check Last-Modified date of new $zipFile.\n" if $result;
 
 if (!$result && open NEW, "$tmpDir/$file.headers") {
-    my $new = <NEW>;
+    my $new = lastModifiedToUnixTime(<NEW>);
     close NEW;
 
-    if (open OLD, "$webkitLibrariesDir/$file.headers") {
-        my $old = <OLD>;
+    if (defined $new && open OLD, "$webkitLibrariesDir/$file.headers") {
+        my $old = lastModifiedToUnixTime(<OLD>);
         close OLD;
-        if ($old eq $new) {
+        if (defined $old && abs($new - $old) < $newnessThreshold) {
             print "Current $file is up to date\n";
             exit 0;
         }
@@ -101,3 +111,11 @@ sub toUnixPath
     chomp($path = `cygpath -u '$path'`);
     return $path;
 }
+
+sub lastModifiedToUnixTime($)
+{
+    my ($str) = @_;
+
+    $str =~ /^Last-Modified: (.*)$/ or return;
+    return str2time($1);
+}