<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162616] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162616">162616</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-23 09:25:31 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build-webkit --sdk=iphonesimulator doesn't think it's building iOS
https://bugs.webkit.org/show_bug.cgi?id=127379
Reviewed by Simon Fraser.
Teach build-webkit to recognize --sdk=X.
Currently, build-webkit recognizes --sdk X to specify X as the Xcode SDK to use, which is also
considered when determining the WebKit port to build. But build-webkit advertises --sdk=X in its
help message. We should teach build-webkit to recognize both --sdk X and --sdk=X to make its handling
of --sdk more consistent with the handling of other build-webkit options that take a value (e.g. --prefix).
* Scripts/webkitdirs.pm:
(checkForArgumentAndRemoveFromArrayRefGettingValue): Added.
(checkForArgumentAndRemoveFromARGVGettingValue): Modified to call checkForArgumentAndRemoveFromArrayRefGettingValue().
* Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitperlwebkitdirs_unittestcheckForArgumentAndRemoveFromArrayRefGettingValuepl">trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162615 => 162616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-23 17:23:47 UTC (rev 162615)
+++ trunk/Tools/ChangeLog 2014-01-23 17:25:31 UTC (rev 162616)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-23 Daniel Bates <dabates@apple.com>
+
+ build-webkit --sdk=iphonesimulator doesn't think it's building iOS
+ https://bugs.webkit.org/show_bug.cgi?id=127379
+
+ Reviewed by Simon Fraser.
+
+ Teach build-webkit to recognize --sdk=X.
+
+ Currently, build-webkit recognizes --sdk X to specify X as the Xcode SDK to use, which is also
+ considered when determining the WebKit port to build. But build-webkit advertises --sdk=X in its
+ help message. We should teach build-webkit to recognize both --sdk X and --sdk=X to make its handling
+ of --sdk more consistent with the handling of other build-webkit options that take a value (e.g. --prefix).
+
+ * Scripts/webkitdirs.pm:
+ (checkForArgumentAndRemoveFromArrayRefGettingValue): Added.
+ (checkForArgumentAndRemoveFromARGVGettingValue): Modified to call checkForArgumentAndRemoveFromArrayRefGettingValue().
+ * Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl: Added.
+
</ins><span class="cx"> 2014-01-23 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r162612.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (162615 => 162616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-23 17:23:47 UTC (rev 162615)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-23 17:25:31 UTC (rev 162616)
</span><span class="lines">@@ -859,13 +859,30 @@
</span><span class="cx"> return checkForArgumentAndRemoveFromArrayRef($argToCheck, \@ARGV);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub checkForArgumentAndRemoveFromArrayRefGettingValue($$$)
+{
+ my ($argToCheck, $valueRef, $arrayRef) = @_;
+ my $argumentStartRegEx = qr#^$argToCheck(?:=\S|$)#;
+ my $i = 0;
+ for (; $i < @$arrayRef; ++$i) {
+ last if $arrayRef->[$i] =~ $argumentStartRegEx;
+ }
+ if ($i >= @$arrayRef) {
+ return $$valueRef = undef;
+ }
+ my ($key, $value) = split("=", $arrayRef->[$i]);
+ splice(@$arrayRef, $i, 1);
+ if (defined($value)) {
+ # e.g. --sdk=iphonesimulator
+ return $$valueRef = $value;
+ }
+ return $$valueRef = splice(@$arrayRef, $i, 1); # e.g. --sdk iphonesimulator
+}
+
</ins><span class="cx"> sub checkForArgumentAndRemoveFromARGVGettingValue($$)
</span><span class="cx"> {
</span><span class="cx"> my ($argToCheck, $valueRef) = @_;
</span><del>- my @matchingIndices = findMatchingArguments($argToCheck, \@ARGV);
- return 0 if ($#matchingIndices != 1);
- splice(@ARGV, $matchingIndices[0], 1);
- return $$valueRef = splice(@ARGV, $matchingIndices[0], 1);
</del><ins>+ return checkForArgumentAndRemoveFromArrayRefGettingValue($argToCheck, $valueRef, \@ARGV);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub findMatchingArguments($$)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlwebkitdirs_unittestcheckForArgumentAndRemoveFromArrayRefGettingValuepl"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl (0 => 162616)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl (rev 0)
+++ trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl 2014-01-23 17:25:31 UTC (rev 162616)
</span><span class="lines">@@ -0,0 +1,118 @@
</span><ins>+#!/usr/bin/perl -w
+#
+# Copyright (C) 2014 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Unit tests of webkitdirs::checkForArgumentAndRemoveFromArrayRefGettingValue
+use strict;
+use warnings;
+
+use Test::More;
+use webkitdirs;
+
+my @testCases = (
+{
+ description => "empty string in empty array",
+ argToCheck => "",
+ args => [],
+ expectedArgs => [],
+ expectedReturn => undef,
+},
+{
+ description => "non-existent option in empty array",
+ argToCheck => "--sdk",
+ args => [],
+ expectedArgs => [],
+ expectedReturn => undef,
+},
+{
+ description => "non-existent option in non-empty array",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug"],
+ expectedArgs => ["--clean", "--debug"],
+ expectedReturn => undef,
+},
+{
+ description => "option with specified value",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk", "iphonesimulator"],
+ expectedArgs => ["--clean", "--debug"],
+ expectedReturn => "iphonesimulator",
+},
+{
+ description => "option with specified value whose value follows an equal sign",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk=iphonesimulator"],
+ expectedArgs => ["--clean", "--debug"],
+ expectedReturn => "iphonesimulator",
+},
+{
+ description => "option whose value is the empty string and follows an equal sign", # Unrecognized argument; no change
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
+ expectedArgs => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
+ expectedReturn => undef,
+},
+{
+ description => "multiple options of the same name",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk=iphonesimulator", "--sdk=macosx"],
+ expectedArgs => ["--clean", "--debug", "--sdk=macosx"],
+ expectedReturn => "iphonesimulator",
+},
+####
+# Malformed input
+##
+# We shouldn't encounter such input in practice.
+{
+ description => "malformed: option with unspecified value at the end of the array",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk"],
+ expectedArgs => ["--clean", "--debug"],
+ expectedReturn => undef,
+},
+{
+ description => "malformed: option with unspecified value",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk", "--no-webkit2"],
+ expectedArgs => ["--clean", "--debug"],
+ expectedReturn => "--no-webkit2",
+},
+{
+ description => "malformed: multiple options of the same name; first occurrence has unspecified value",
+ argToCheck => "--sdk",
+ args => ["--clean", "--debug", "--sdk", "--sdk=iphonesimulator", "--sdk=macosx"],
+ expectedArgs => ["--clean", "--debug", "--sdk=macosx"],
+ expectedReturn => "--sdk=iphonesimulator",
+},
+);
+
+plan(tests => 3 * @testCases);
+
+foreach my $testCase (@testCases) {
+ my $testNameStart = "checkForArgumentAndRemoveFromArrayRef(): $testCase->{description}: comparing";
+ my $actualValue;
+ my @shadowArgs = @{$testCase->{args}}; # Copy the arguments since checkForArgumentAndRemoveFromArrayRefGettingValue() mutates the specified array.
+ is(checkForArgumentAndRemoveFromArrayRefGettingValue($testCase->{argToCheck}, \$actualValue, \@shadowArgs), $testCase->{expectedReturn}, "$testNameStart return value");
+ is($actualValue, $testCase->{expectedReturn}, "$testNameStart out parameter");
+ is_deeply(\@shadowArgs, $testCase->{expectedArgs}, "$testNameStart array");
+}
</ins></span></pre>
</div>
</div>
</body>
</html>