<!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>[195746] 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/195746">195746</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-01-28 09:44:05 -0800 (Thu, 28 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/195742">r195742</a>.
Broke EWS
Reverted changeset:
"[webkitdirs] Clarify logic behind is{PortName} functions."
https://bugs.webkit.org/show_bug.cgi?id=153554
http://trac.webkit.org/changeset/195742</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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (195745 => 195746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-01-28 17:33:46 UTC (rev 195745)
+++ trunk/Tools/ChangeLog 2016-01-28 17:44:05 UTC (rev 195746)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-28 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, rolling out r195742.
+
+ Broke EWS
+
+ Reverted changeset:
+
+ "[webkitdirs] Clarify logic behind is{PortName} functions."
+ https://bugs.webkit.org/show_bug.cgi?id=153554
+ http://trac.webkit.org/changeset/195742
+
</ins><span class="cx"> 2016-01-28 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove equalIgnoringCase since all callers really wanted equalIgnoringASCIICase
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (195745 => 195746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 17:33:46 UTC (rev 195745)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-01-28 17:44:05 UTC (rev 195746)
</span><span class="lines">@@ -94,16 +94,6 @@
</span><span class="cx"> @EXPORT_OK = ();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# Ports
-use constant {
- AppleWin => "AppleWin",
- GTK => "GTK",
- Efl => "Efl",
- iOS => "iOS",
- Mac => "Mac",
- WinCairo => "WinCairo"
-};
-
</del><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">@@ -134,9 +124,11 @@
</span><span class="cx"> my $iosVersion;
</span><span class="cx"> my $generateDsym;
</span><span class="cx"> my $isCMakeBuild;
</span><ins>+my $isGtk;
+my $isWinCairo;
</ins><span class="cx"> my $isWin64;
</span><ins>+my $isEfl;
</ins><span class="cx"> my $isInspectorFrontend;
</span><del>-my $portName;
</del><span class="cx"> my $shouldTargetWebProcess;
</span><span class="cx"> my $shouldUseXPCServiceForWebProcess;
</span><span class="cx"> my $shouldUseGuardMalloc;
</span><span class="lines">@@ -1032,57 +1024,28 @@
</span><span class="cx"> return scalar @indicesToRemove > 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub determinePortName()
</del><ins>+sub determineIsEfl()
</ins><span class="cx"> {
</span><del>- 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'"
- 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 {
- die "Please choose which WebKit port to build";
- }
</del><ins>+ return if defined($isEfl);
+ $isEfl = checkForArgumentAndRemoveFromARGV("--efl");
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub portName()
</del><ins>+sub isEfl()
</ins><span class="cx"> {
</span><del>- determinePortName();
- return $portName;
</del><ins>+ determineIsEfl();
+ return $isEfl;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub isEfl()
</del><ins>+sub determineIsGtk()
</ins><span class="cx"> {
</span><del>- return portName() eq Efl;
</del><ins>+ return if defined($isGtk);
+ $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isGtk()
</span><span class="cx"> {
</span><del>- return portName() eq GTK;
</del><ins>+ determineIsGtk();
+ return $isGtk;
</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">@@ -1098,9 +1061,16 @@
</span><span class="cx">
</span><span class="cx"> sub isWinCairo()
</span><span class="cx"> {
</span><del>- return portName() eq WinCairo;
</del><ins>+ determineIsWinCairo();
+ return $isWinCairo;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+sub determineIsWinCairo()
+{
+ return if defined($isWinCairo);
+ $isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
+}
+
</ins><span class="cx"> sub isWin64()
</span><span class="cx"> {
</span><span class="cx"> determineIsWin64();
</span><span class="lines">@@ -1221,12 +1191,12 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleMacWebKit()
</span><span class="cx"> {
</span><del>- return (portName() eq Mac) || isIOSWebKit();
</del><ins>+ return isDarwin() && !isGtk();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isAppleWinWebKit()
</span><span class="cx"> {
</span><del>- return portName() eq AppleWin;
</del><ins>+ return (isCygwin() || isWindows()) && !isWinCairo() && !isGtk();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub iOSSimulatorDevicesPath
</span><span class="lines">@@ -1289,7 +1259,8 @@
</span><span class="cx">
</span><span class="cx"> sub isIOSWebKit()
</span><span class="cx"> {
</span><del>- return portName() eq iOS;
</del><ins>+ determineXcodeSDK();
+ return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineNmPath()
</span><span class="lines">@@ -2090,7 +2061,12 @@
</span><span class="cx">
</span><span class="cx"> sub cmakeBasedPortName()
</span><span class="cx"> {
</span><del>- return portName();
</del><ins>+ return "Efl" if isEfl();
+ return "GTK" if isGtk();
+ return "Mac" if isAppleMacWebKit();
+ return "WinCairo" if isWinCairo();
+ return "AppleWin" if isAppleWinWebKit();
+ return "";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineIsCMakeBuild()
</span></span></pre>
</div>
</div>
</body>
</html>