[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 299a34d9e8f68a489fad9e0af7ca932515113074
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 15 00:52:29 2010 +0000

    2010-08-14  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [GTK] autogen.sh not executed if build-webkit options change
            https://bugs.webkit.org/show_bug.cgi?id=42266
    
            Rerun autogen.sh in situations where the arguments to build-webkit have
            changed since the previous build. This will fix some issues on the bots
            where the build does not notice changes to default build-webkit arguments.
    
            * Scripts/webkitdirs.pm: Add special logic for detecting changes to build-webkit arguments.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65377 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a67f2a6..7317946 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-14  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [GTK] autogen.sh not executed if build-webkit options change
+        https://bugs.webkit.org/show_bug.cgi?id=42266
+
+        Rerun autogen.sh in situations where the arguments to build-webkit have
+        changed since the previous build. This will fix some issues on the bots
+        where the build does not notice changes to default build-webkit arguments.
+
+        * Scripts/webkitdirs.pm: Add special logic for detecting changes to build-webkit arguments.
+
 2010-08-14  Eric Seidel  <eric at webkit.org>
 
         Unreviewed.  Another fix to support python 2.3.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 028d63d..6530244 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1302,6 +1302,21 @@ sub autotoolsFlag($$)
     return $prefix . '-' . $feature;
 }
 
+sub autogenArgumentsHaveChanged($@)
+{
+    my ($filename, @currentArguments) = @_;
+
+    if (! -e $filename) {
+        return 1;
+    }
+
+    open(AUTOTOOLS_ARGUMENTS, $filename);
+    chomp(my $previousArguments = <AUTOTOOLS_ARGUMENTS>);
+    close(AUTOTOOLS_ARGUMENTS);
+
+    return $previousArguments ne join(" ", @currentArguments);
+}
+
 sub buildAutotoolsProject($@)
 {
     my ($clean, @buildParams) = @_;
@@ -1357,8 +1372,16 @@ sub buildAutotoolsProject($@)
     # If GNUmakefile exists, don't run autogen.sh. The makefile should be
     # smart enough to track autotools dependencies and re-run autogen.sh
     # when build files change.
+    my $autogenArgumentsFile = "previous-autogen-arguments.txt";
     my $result;
-    if (! -e "GNUmakefile") {
+    if (!(-e "GNUmakefile") or autogenArgumentsHaveChanged($autogenArgumentsFile, @buildArgs)) {
+
+        # Write autogen.sh arguments to a file so that we can detect
+        # when they change and automatically re-run it.
+        open(AUTOTOOLS_ARGUMENTS, ">$autogenArgumentsFile");
+        print AUTOTOOLS_ARGUMENTS  join(" ", @buildArgs);
+        close(AUTOTOOLS_ARGUMENTS);
+
         print "Calling configure in " . $dir . "\n\n";
         print "Installation prefix directory: $prefix\n" if(defined($prefix));
 

-- 
WebKit Debian packaging