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

[mihaip at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit dfe9845d0b7a5bb70940d5f0e2c7f083d7a1d4d0
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 00:03:55 2010 +0000

    2010-12-01  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            build-webkit --chromium always updates DEPS and re-generates project files
            https://bugs.webkit.org/show_bug.cgi?id=50340
    
            Make build-webkit --chromium invoke update-webkit-chromium only when
            --update-chromium is passed in, so that we don't add 20 seconds to all
            builds.
    
            Making all invocations update was added with r61883, with the goal of
            making EWS bots always update. The bots will switch to using this flag
            (as will all other webkit-patch build steps) so nothing should change
            for them.
    
            * Scripts/webkitdirs.pm:
            * Scripts/webkitpy/common/config/ports.py:
            * Scripts/webkitpy/common/config/ports_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73082 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0e8ea6e..db447a0 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-12-01  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        build-webkit --chromium always updates DEPS and re-generates project files
+        https://bugs.webkit.org/show_bug.cgi?id=50340
+        
+        Make build-webkit --chromium invoke update-webkit-chromium only when
+        --update-chromium is passed in, so that we don't add 20 seconds to all
+        builds.
+        
+        Making all invocations update was added with r61883, with the goal of
+        making EWS bots always update. The bots will switch to using this flag
+        (as will all other webkit-patch build steps) so nothing should change
+        for them.
+
+        * Scripts/webkitdirs.pm:
+        * Scripts/webkitpy/common/config/ports.py:
+        * Scripts/webkitpy/common/config/ports_unittest.py:
+
 2010-12-01  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 1e474e2..73288e0 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -680,15 +680,26 @@ sub determineQtFeatureDefaults()
 sub checkForArgumentAndRemoveFromARGV
 {
     my $argToCheck = shift;
-    foreach my $opt (@ARGV) {
+    return checkForArgumentAndRemoveFromArrayRef($argToCheck, \@ARGV);
+}
+
+sub checkForArgumentAndRemoveFromArrayRef
+{
+    my ($argToCheck, $arrayRef) = @_;
+    my @indicesToRemove;
+    foreach my $index (0 .. $#$arrayRef) {
+        my $opt = $$arrayRef[$index];
         if ($opt =~ /^$argToCheck$/i ) {
-            @ARGV = grep(!/^$argToCheck$/i, @ARGV);
-            return 1;
+            push(@indicesToRemove, $index);
         }
     }
-    return 0;
+    foreach my $index (@indicesToRemove) {
+        splice(@$arrayRef, $index, 1);
+    }
+    return $#indicesToRemove > -1;
 }
 
+
 sub determineIsQt()
 {
     return if defined($isQt);
@@ -1677,7 +1688,9 @@ sub buildChromium($@)
     my ($clean, @options) = @_;
 
     # We might need to update DEPS or re-run GYP if things have changed.
-    system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!;
+    if (checkForArgumentAndRemoveFromArrayRef("--update-chromium", \@options)) {
+        system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!;
+    }
 
     my $result = 1;
     if (isDarwin()) {
diff --git a/WebKitTools/Scripts/webkitpy/common/config/ports.py b/WebKitTools/Scripts/webkitpy/common/config/ports.py
index d268865..5f15e88 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/ports.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/ports.py
@@ -221,6 +221,7 @@ class ChromiumPort(WebKitPort):
     def build_webkit_command(cls, build_style=None):
         command = WebKitPort.build_webkit_command(build_style=build_style)
         command.append("--chromium")
+        command.append("--update-chromium")
         return command
 
     @classmethod
diff --git a/WebKitTools/Scripts/webkitpy/common/config/ports_unittest.py b/WebKitTools/Scripts/webkitpy/common/config/ports_unittest.py
index 3bdf0e6..125981a 100644
--- a/WebKitTools/Scripts/webkitpy/common/config/ports_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/common/config/ports_unittest.py
@@ -65,8 +65,8 @@ class WebKitPortTest(unittest.TestCase):
         self.assertEquals(ChromiumPort.name(), "Chromium")
         self.assertEquals(ChromiumPort.flag(), "--port=chromium")
         self.assertEquals(ChromiumPort.run_webkit_tests_command(), [WebKitPort.script_path("new-run-webkit-tests"), "--chromium", "--use-drt", "--no-pixel-tests"])
-        self.assertEquals(ChromiumPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--chromium"])
-        self.assertEquals(ChromiumPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--chromium"])
+        self.assertEquals(ChromiumPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--chromium", "--update-chromium"])
+        self.assertEquals(ChromiumPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--chromium", "--update-chromium"])
         self.assertEquals(ChromiumPort.update_webkit_command(), [WebKitPort.script_path("update-webkit"), "--chromium"])
 
     def test_chromium_xvfb_port(self):

-- 
WebKit Debian packaging