<!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>[196065] 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/196065">196065</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-03 03:38:13 -0800 (Wed, 03 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[webkitdirs] Clarify logic behind is{PortName} functions.
https://bugs.webkit.org/show_bug.cgi?id=153554
Patch by Konstantin Tokarev <annulen@yandex.ru> on 2016-02-03
Reviewed by Michael Catanzaro.
* Scripts/webkitdirs.pm:
(prohibitUnknownPort): This function makes determinePortName()
failure fatal.
(determinePortName): Added new function which decides which port are
we building based on command line switches and platform defaults.
(portName): Added getter for determined $portName.
(isEfl): Modified to use portName().
(isGtk): Ditto.
(isWinCairo): Ditto.
(isAppleMacWebKit): Ditto.
(isAppleWinWebKit): Ditto.
(isIOSWebKit): Ditto.
(cmakeBasedPortName): Return portName() with capitalized first letter.
(determineIsEfl): Deleted.
(determineIsGtk): Deleted.
(determineIsWinCairo): Deleted.
* Scripts/build-jsc: Call prohibitUnknownPort().
* Scripts/run-minibrowser: Ditto.
* Scripts/webkitperl/FeatureList.pm: Ditto.
* Scripts/update-webkit: Call determinePortName() instead of
determineIsWinCairo().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsrunminibrowser">trunk/Tools/Scripts/run-minibrowser</a></li>
<li><a href="#trunkToolsScriptsupdatewebkit">trunk/Tools/Scripts/update-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/ChangeLog 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-02-03 Konstantin Tokarev <annulen@yandex.ru>
+
+ [webkitdirs] Clarify logic behind is{PortName} functions.
+ https://bugs.webkit.org/show_bug.cgi?id=153554
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitdirs.pm:
+ (prohibitUnknownPort): This function makes determinePortName()
+ failure fatal.
+ (determinePortName): Added new function which decides which port are
+ we building based on command line switches and platform defaults.
+ (portName): Added getter for determined $portName.
+ (isEfl): Modified to use portName().
+ (isGtk): Ditto.
+ (isWinCairo): Ditto.
+ (isAppleMacWebKit): Ditto.
+ (isAppleWinWebKit): Ditto.
+ (isIOSWebKit): Ditto.
+ (cmakeBasedPortName): Return portName() with capitalized first letter.
+ (determineIsEfl): Deleted.
+ (determineIsGtk): Deleted.
+ (determineIsWinCairo): Deleted.
+
+ * Scripts/build-jsc: Call prohibitUnknownPort().
+ * Scripts/run-minibrowser: Ditto.
+ * Scripts/webkitperl/FeatureList.pm: Ditto.
+ * Scripts/update-webkit: Call determinePortName() instead of
+ determineIsWinCairo().
+
</ins><span class="cx"> 2016-02-02 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Better fix for Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/Scripts/build-jsc 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx">
</span><span class="cx"> sub writeCongrats();
</span><span class="cx">
</span><ins>+prohibitUnknownPort();
+
</ins><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span></span></pre></div>
<a id="trunkToolsScriptsrunminibrowser"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-minibrowser (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-minibrowser 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/Scripts/run-minibrowser 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> my $launcherPath;
</span><span class="cx"> my @jhbuildWrapper;
</span><span class="cx">
</span><ins>+prohibitUnknownPort();
</ins><span class="cx"> setConfiguration();
</span><span class="cx">
</span><span class="cx"> if (isGtk() || isEfl()) {
</span></span></pre></div>
<a id="trunkToolsScriptsupdatewebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/update-webkit (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/update-webkit 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/Scripts/update-webkit 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -43,7 +43,9 @@
</span><span class="cx"> my $quiet = '';
</span><span class="cx"> my $showHelp;
</span><span class="cx">
</span><del>-determineIsWinCairo();
</del><ins>+# This call is needed to eat --wincairo argument and avoid unknown option error.
+# FIXME: Allow port options explicitly or make this script port-agnostic.
+determinePortName();
</ins><span class="cx">
</span><span class="cx"> chdirWebKit();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -94,6 +94,17 @@
</span><span class="cx"> @EXPORT_OK = ();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# Ports
+use constant {
+ AppleWin => "AppleWin",
+ GTK => "GTK",
+ Efl => "Efl",
+ iOS => "iOS",
+ Mac => "Mac",
+ WinCairo => "WinCairo",
+ Unknown => "Unknown"
+};
+
</ins><span class="cx"> use constant USE_OPEN_COMMAND => 1; # Used in runMacWebKitApp().
</span><span class="cx"> use constant INCLUDE_OPTIONS_FOR_DEBUGGING => 1;
</span><span class="cx"> use constant SIMULATOR_DEVICE_STATE_SHUTDOWN => "1";
</span><span class="lines">@@ -124,17 +135,17 @@
</span><span class="cx"> my $iosVersion;
</span><span class="cx"> my $generateDsym;
</span><span class="cx"> my $isCMakeBuild;
</span><del>-my $isGtk;
-my $isWinCairo;
</del><span class="cx"> my $isWin64;
</span><del>-my $isEfl;
</del><span class="cx"> my $isInspectorFrontend;
</span><ins>+my $portName;
</ins><span class="cx"> my $shouldTargetWebProcess;
</span><span class="cx"> my $shouldUseXPCServiceForWebProcess;
</span><span class="cx"> my $shouldUseGuardMalloc;
</span><span class="cx"> my $shouldNotUseNinja;
</span><span class="cx"> my $xcodeVersion;
</span><span class="cx">
</span><ins>+my $unknownPortProhibited = 0;
+
</ins><span class="cx"> # Variables for Win32 support
</span><span class="cx"> my $programFilesPath;
</span><span class="cx"> my $vcBuildPath;
</span><span class="lines">@@ -1024,28 +1035,73 @@
</span><span class="cx"> return scalar @indicesToRemove > 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub determineIsEfl()
</del><ins>+sub prohibitUnknownPort()
</ins><span class="cx"> {
</span><del>- return if defined($isEfl);
- $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
</del><ins>+ $unknownPortProhibited = 1;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub isEfl()
</del><ins>+sub determinePortName()
</ins><span class="cx"> {
</span><del>- determineIsEfl();
- return $isEfl;
</del><ins>+ return if defined $portName;
+
+ my %argToPortName = (
+ efl => Efl,
+ gtk => GTK,
+ wincairo => WinCairo
+ );
+
+ for my $arg (sort keys %argToPortName) {
+ if (checkForArgumentAndRemoveFromARGV("--$arg")) {
+ die "Argument '--$arg' conflicts with selected port '$portName'\n"
+ if defined $portName;
+
+ $portName = $argToPortName{$arg};
+ }
+ }
+
+ return if defined $portName;
+
+ # Port was not selected via command line, use appropriate default value
+
+ if (isAnyWindows()) {
+ $portName = AppleWin;
+ } elsif (isDarwin()) {
+ determineXcodeSDK();
+ if (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK()) {
+ $portName = iOS;
+ } else {
+ $portName = Mac;
+ }
+ } else {
+ if ($unknownPortProhibited) {
+ my $portsChoice = join "\n\t", qw(
+ --efl
+ --gtk
+ );
+ die "Please specify which WebKit port to build using one of the following options:"
+ . "\n\t$portsChoice\n";
+ }
+
+ # If script is run without arguments we cannot determine port
+ # TODO: This state should be outlawed
+ $portName = Unknown;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub determineIsGtk()
</del><ins>+sub portName()
</ins><span class="cx"> {
</span><del>- return if defined($isGtk);
- $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
</del><ins>+ determinePortName();
+ return $portName;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+sub isEfl()
+{
+ return portName() eq Efl;
+}
+
</ins><span class="cx"> sub isGtk()
</span><span class="cx"> {
</span><del>- determineIsGtk();
- return $isGtk;
</del><ins>+ return portName() eq GTK;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Determine if this is debian, ubuntu, linspire, or something similar.
</span><span class="lines">@@ -1061,16 +1117,9 @@
</span><span class="cx">
</span><span class="cx"> sub isWinCairo()
</span><span class="cx"> {
</span><del>- determineIsWinCairo();
- return $isWinCairo;
</del><ins>+ return portName() eq WinCairo;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub determineIsWinCairo()
-{
- return if defined($isWinCairo);
- $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
-}
-
</del><span class="cx"> sub isWin64()
</span><span class="cx"> {
</span><span class="cx"> determineIsWin64();
</span><span class="lines">@@ -1191,12 +1240,12 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleMacWebKit()
</span><span class="cx"> {
</span><del>- return isDarwin() && !isGtk();
</del><ins>+ return (portName() eq Mac) || isIOSWebKit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isAppleWinWebKit()
</span><span class="cx"> {
</span><del>- return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
</del><ins>+ return portName() eq AppleWin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub iOSSimulatorDevicesPath
</span><span class="lines">@@ -1259,8 +1308,7 @@
</span><span class="cx">
</span><span class="cx"> sub isIOSWebKit()
</span><span class="cx"> {
</span><del>- determineXcodeSDK();
- return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
</del><ins>+ return portName() eq iOS;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineNmPath()
</span><span class="lines">@@ -2062,12 +2110,7 @@
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortName()
</span><span class="cx"> {
</span><del>- return "Efl" if isEfl();
- return "GTK" if isGtk();
- return "Mac" if isAppleMacWebKit();
- return "WinCairo" if isWinCairo();
- return "AppleWin" if isAppleWinWebKit();
- return "";
</del><ins>+ return ucfirst portName();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineIsCMakeBuild()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (196064 => 196065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-02-03 11:29:25 UTC (rev 196064)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2016-02-03 11:38:13 UTC (rev 196065)
</span><span class="lines">@@ -154,6 +154,8 @@
</span><span class="cx"> $ftlJITSupport,
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+prohibitUnknownPort();
+
</ins><span class="cx"> my @features = (
</span><span class="cx"> { option => "3d-rendering", desc => "Toggle 3D Rendering support",
</span><span class="cx"> define => "ENABLE_3D_TRANSFORMS", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDTransformsSupport },
</span></span></pre>
</div>
</div>
</body>
</html>