diff options
author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitTools/Scripts/webkitdirs.pm | |
parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitTools/Scripts/webkitdirs.pm')
-rw-r--r-- | WebKitTools/Scripts/webkitdirs.pm | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm index 73288e0..1e474e2 100644 --- a/WebKitTools/Scripts/webkitdirs.pm +++ b/WebKitTools/Scripts/webkitdirs.pm @@ -680,26 +680,15 @@ sub determineQtFeatureDefaults() sub checkForArgumentAndRemoveFromARGV { my $argToCheck = shift; - return checkForArgumentAndRemoveFromArrayRef($argToCheck, \@ARGV); -} - -sub checkForArgumentAndRemoveFromArrayRef -{ - my ($argToCheck, $arrayRef) = @_; - my @indicesToRemove; - foreach my $index (0 .. $#$arrayRef) { - my $opt = $$arrayRef[$index]; + foreach my $opt (@ARGV) { if ($opt =~ /^$argToCheck$/i ) { - push(@indicesToRemove, $index); + @ARGV = grep(!/^$argToCheck$/i, @ARGV); + return 1; } } - foreach my $index (@indicesToRemove) { - splice(@$arrayRef, $index, 1); - } - return $#indicesToRemove > -1; + return 0; } - sub determineIsQt() { return if defined($isQt); @@ -1688,9 +1677,7 @@ sub buildChromium($@) my ($clean, @options) = @_; # We might need to update DEPS or re-run GYP if things have changed. - if (checkForArgumentAndRemoveFromArrayRef("--update-chromium", \@options)) { - system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!; - } + system("perl", "WebKitTools/Scripts/update-webkit-chromium") == 0 or die $!; my $result = 1; if (isDarwin()) { |