<!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>[211998] 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/211998">211998</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-09 15:46:56 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename isAppleMacWebKit to isAppleCocoaWebKit
https://bugs.webkit.org/show_bug.cgi?id=168075
Patch by Alex Christensen <achristensen@webkit.org> on 2017-02-09
Reviewed by Geoffrey Garen.
It returns true for Mac and iOS. "isAppleMacWebKit" is confusing and wrong.
* Scripts/build-api-tests:
* Scripts/build-dumprendertree:
* Scripts/build-jsc:
(buildMyProject):
* Scripts/build-layouttestrelay:
* Scripts/build-webkit:
* Scripts/build-webkittestrunner:
* Scripts/run-api-tests:
(isSupportedPlatform):
(runTest):
(listAllTests):
(prepareEnvironmentForRunningTestTool):
* Scripts/run-content-extension-tester:
* Scripts/run-javascriptcore-tests:
* Scripts/run-minibrowser:
* Scripts/show-pretty-diff:
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
(determineArchitecture):
(determinePassedArchitecture):
(safariPath):
(builtDylibPathForName):
(checkFrameworks):
(isAppleWebKit):
(isAppleCocoaWebKit):
(determineNmPath):
(launcherName):
(wrapperPrefixIfNeeded):
(isCMakeBuild):
(mobileSafariBundle):
(debugSafari):
(runSafari):
(runMiniBrowser):
(debugMiniBrowser):
(runWebKitTestRunner):
(debugWebKitTestRunner):
(isAppleMacWebKit): Deleted.
* Scripts/webkitperl/FeatureList.pm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildapitests">trunk/Tools/Scripts/build-api-tests</a></li>
<li><a href="#trunkToolsScriptsbuilddumprendertree">trunk/Tools/Scripts/build-dumprendertree</a></li>
<li><a href="#trunkToolsScriptsbuildjsc">trunk/Tools/Scripts/build-jsc</a></li>
<li><a href="#trunkToolsScriptsbuildlayouttestrelay">trunk/Tools/Scripts/build-layouttestrelay</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptsbuildwebkittestrunner">trunk/Tools/Scripts/build-webkittestrunner</a></li>
<li><a href="#trunkToolsScriptsrunapitests">trunk/Tools/Scripts/run-api-tests</a></li>
<li><a href="#trunkToolsScriptsruncontentextensiontester">trunk/Tools/Scripts/run-content-extension-tester</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</a></li>
<li><a href="#trunkToolsScriptsrunminibrowser">trunk/Tools/Scripts/run-minibrowser</a></li>
<li><a href="#trunkToolsScriptsshowprettydiff">trunk/Tools/Scripts/show-pretty-diff</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 (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/ChangeLog 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2017-02-09 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Rename isAppleMacWebKit to isAppleCocoaWebKit
+ https://bugs.webkit.org/show_bug.cgi?id=168075
+
+ Reviewed by Geoffrey Garen.
+
+ It returns true for Mac and iOS. "isAppleMacWebKit" is confusing and wrong.
+
+ * Scripts/build-api-tests:
+ * Scripts/build-dumprendertree:
+ * Scripts/build-jsc:
+ (buildMyProject):
+ * Scripts/build-layouttestrelay:
+ * Scripts/build-webkit:
+ * Scripts/build-webkittestrunner:
+ * Scripts/run-api-tests:
+ (isSupportedPlatform):
+ (runTest):
+ (listAllTests):
+ (prepareEnvironmentForRunningTestTool):
+ * Scripts/run-content-extension-tester:
+ * Scripts/run-javascriptcore-tests:
+ * Scripts/run-minibrowser:
+ * Scripts/show-pretty-diff:
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+ (determineArchitecture):
+ (determinePassedArchitecture):
+ (safariPath):
+ (builtDylibPathForName):
+ (checkFrameworks):
+ (isAppleWebKit):
+ (isAppleCocoaWebKit):
+ (determineNmPath):
+ (launcherName):
+ (wrapperPrefixIfNeeded):
+ (isCMakeBuild):
+ (mobileSafariBundle):
+ (debugSafari):
+ (runSafari):
+ (runMiniBrowser):
+ (debugMiniBrowser):
+ (runWebKitTestRunner):
+ (debugWebKitTestRunner):
+ (isAppleMacWebKit): Deleted.
+ * Scripts/webkitperl/FeatureList.pm:
+
+2017-02-09 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Revert r211991
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=168062
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsbuildapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-api-tests (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-api-tests 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-api-tests 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> # Build
</span><span class="cx">
</span><span class="cx"> my $result;
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> chdir "Source/ThirdParty/gtest";
</span><span class="cx"> buildXCodeProject("xcode/gtest", $clean, XcodeOptions(), @ARGV);
</span><span class="cx"> chdir "../../../Tools/TestWebKitAPI" or die;
</span></span></pre></div>
<a id="trunkToolsScriptsbuilddumprendertree"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-dumprendertree (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-dumprendertree 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-dumprendertree 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> chdir File::Spec->catdir("Tools", "DumpRenderTree") or die;
</span><span class="cx">
</span><span class="cx"> my $result;
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> $result = buildXCodeProject("DumpRenderTree", $clean, XcodeOptions(), @ARGV);
</span><span class="cx"> } elsif (isGtk() || isEfl() || isAnyWindows()) {
</span><span class="cx"> # Gtk, EFL, and Windows build everything in one shot. No need to build anything here.
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-jsc 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> my $minimal = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span><del>-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl() || isJSCOnly()));
</del><ins>+my $ftlJIT = int(isAppleCocoaWebKit() && !willUseIOSSimulatorSDK() || isX86_64() && (isGtk() || isEfl() || isJSCOnly()));
</ins><span class="cx"> my $forceCLoop = 0;
</span><span class="cx"> my $cli = 0;
</span><span class="cx"> my $makeArgs = "";
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> exit exitStatus(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> push @options, ($forceCLoop ? "ENABLE_JIT=ENABLE_JIT=0" : "ENABLE_JIT=ENABLE_JIT");
</span><span class="cx"> push @options, ($ftlJIT ? "ENABLE_FTL_JIT=ENABLE_FTL_JIT" : "ENABLE_FTL_JIT=ENABLE_FTL_JIT=0");
</span><span class="cx">
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> my ($projectDirectory, $projectName) = @_;
</span><span class="cx"> my $result;
</span><span class="cx"> chdir $projectDirectory or die "Can't find $projectName directory to build from";
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> $result = system "sh", "-c", ('xcodebuild -project ' . $projectName . '.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}'), "xcodebuild", @options, @ARGV, @additionalSupportOptions;
</span><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> # WTF is a part of JavaScriptCore.sln because jsc.exe wouldn't start otherwise.
</span><span class="lines">@@ -228,6 +228,6 @@
</span><span class="cx"> }
</span><span class="cx"> buildMyProject("Source/WTF", "WTF");
</span><span class="cx"> buildMyProject("Source/JavaScriptCore", "JavaScriptCore");
</span><del>-if (isAppleMacWebKit() && $cli) {
</del><ins>+if (isAppleCocoaWebKit() && $cli) {
</ins><span class="cx"> buildMyProject("Tools/jsc-cli", "jsc-cli");
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsbuildlayouttestrelay"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-layouttestrelay (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-layouttestrelay 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-layouttestrelay 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> # FIXME: This tool is only useful when building WebKit for iOS Simulator. For now,
</span><span class="cx"> # to avoid breaking some Apple Internal tools we support calling this script
</span><span class="cx"> # without --ios-simulator so long as we are building on a Mac.
</span><del>-if (isAppleMacWebKit() && !willUseIOSDeviceSDK()) {
</del><ins>+if (isAppleCocoaWebKit() && !willUseIOSDeviceSDK()) {
</ins><span class="cx"> # FIXME: Changing SDK at this point results in an inconsistent webkitdirs state.
</span><span class="cx"> # We should make it so that webkitdirs functions never see the wrong SDK.
</span><span class="cx"> setXcodeSDK(undef); # Force use of Mac SDK if --ios-simulator was passed
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-webkit 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> # Build WTF as a separate static library on ports which support it.
</span><span class="cx"> splice @projects, 0, 0, "Source/WTF" if isAppleWebKit() or isWinCairo();
</span><span class="cx">
</span><del>-splice @projects, 0, 0, "Source/bmalloc" if isAppleMacWebKit();
</del><ins>+splice @projects, 0, 0, "Source/bmalloc" if isAppleCocoaWebKit();
</ins><span class="cx">
</span><span class="cx"> # Ports using CMake will check if directories exist in the CMake configuration.
</span><span class="cx"> if (!isCMakeBuild()) {
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> my @options = ();
</span><span class="cx">
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> push @options, XcodeOptions();
</span><span class="cx"> sub option($$$)
</span><span class="cx"> {
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> }
</span><span class="cx"> exit exitStatus($result);
</span><span class="cx"> }
</span><del>-} elsif (isAppleMacWebKit() && !isCMakeBuild()) {
</del><ins>+} elsif (isAppleCocoaWebKit() && !isCMakeBuild()) {
</ins><span class="cx"> # Build, and abort if the build fails.
</span><span class="cx"> for my $dir (@projects) {
</span><span class="cx"> chdir $dir or die;
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkittestrunner"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkittestrunner (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkittestrunner 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/build-webkittestrunner 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> chdir "Tools/WebKitTestRunner" or die;
</span><span class="cx">
</span><span class="cx"> my $result;
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> $result = buildXCodeProject("WebKitTestRunner", $clean, XcodeOptions(), @ARGV);
</span><span class="cx"> } elsif (isGtk() || isEfl()) {
</span><span class="cx"> # GTK+ and EFL build everything in one shot. No need to build anything here.
</span></span></pre></div>
<a id="trunkToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-api-tests (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-api-tests 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/run-api-tests 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx">
</span><span class="cx"> sub isSupportedPlatform()
</span><span class="cx"> {
</span><del>- return isAppleMacWebKit() || isAppleWinWebKit();
</del><ins>+ return isAppleCocoaWebKit() || isAppleWinWebKit();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub dumpTestsBySuite(\@)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> my @commonArguments = ($testToToolMap{$test}, $gtestArg, @ARGV);
</span><span class="cx"> if (willUseIOSSimulatorSDK()) {
</span><span class="cx"> $pid = open3($childIn, $childOut, $childErr, qw(xcrun --sdk iphonesimulator simctl spawn), $simulatorDevice->{UDID}, @commonArguments) or die "Failed to run test: $test.";
</span><del>- } elsif (isAppleMacWebKit() && architecture()) {
</del><ins>+ } elsif (isAppleCocoaWebKit() && architecture()) {
</ins><span class="cx"> $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), @commonArguments) or die "Failed to run test: $test.";
</span><span class="cx"> } else {
</span><span class="cx"> $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to run test: $test.";
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> my @commonArguments = ($testTool, "--gtest_list_tests");
</span><span class="cx"> if (isIOSWebKit()) {
</span><span class="cx"> $pid = open3($childIn, $childOut, $childErr, qw(xcrun --sdk iphonesimulator simctl spawn), $simulatorDevice->{UDID}, @commonArguments) or die "Failed to build list of tests!";
</span><del>- } elsif (isAppleMacWebKit() && architecture()) {
</del><ins>+ } elsif (isAppleCocoaWebKit() && architecture()) {
</ins><span class="cx"> $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), @commonArguments) or die "Failed to build list of tests!";
</span><span class="cx"> } else {
</span><span class="cx"> $pid = open3($childIn, $childOut, $childErr, @commonArguments) or die "Failed to build list of tests!";
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> sub prepareEnvironmentForRunningTestTool()
</span><span class="cx"> {
</span><del>- return unless isAppleMacWebKit();
</del><ins>+ return unless isAppleCocoaWebKit();
</ins><span class="cx">
</span><span class="cx"> if (willUseIOSSimulatorSDK()) {
</span><span class="cx"> my %simulatorENV;
</span></span></pre></div>
<a id="trunkToolsScriptsruncontentextensiontester"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-content-extension-tester (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-content-extension-tester 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/run-content-extension-tester 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> setConfiguration();
</span><span class="cx">
</span><del>-if (!isAppleMacWebKit()) {
</del><ins>+if (!isAppleCocoaWebKit()) {
</ins><span class="cx"> exit 1;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> my $buildJSC = 1;
</span><span class="cx">
</span><del>-my $runTestAPI = isAppleMacWebKit() || isAppleWinWebKit() || isWinCairo();
</del><ins>+my $runTestAPI = isAppleCocoaWebKit() || isAppleWinWebKit() || isWinCairo();
</ins><span class="cx">
</span><span class="cx"> my $runJSCStress = 1;
</span><span class="cx"> my $runJITStressTests = 1;
</span></span></pre></div>
<a id="trunkToolsScriptsrunminibrowser"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-minibrowser (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-minibrowser 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/run-minibrowser 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> @jhbuildWrapper = wrapperPrefixIfNeeded();
</span><span class="cx"> print "Starting MiniBrowser.\n";
</span><span class="cx"> exec @jhbuildWrapper, $launcherPath, @ARGV or die;
</span><del>-} elsif (isAppleMacWebKit()) {
</del><ins>+} elsif (isAppleCocoaWebKit()) {
</ins><span class="cx"> printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
</span><span class="cx"> exit exitStatus(runMiniBrowser());
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkToolsScriptsshowprettydiff"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/show-pretty-diff (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/show-pretty-diff 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/show-pretty-diff 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> my $pathToPrettify = "ruby -I " . sourceDir() . "/Websites/bugs.webkit.org/PrettyPatch/ " . sourceDir() . "/Websites/bugs.webkit.org/PrettyPatch/prettify.rb";
</span><span class="cx"> system "$pathToPrettify " . quotemeta($inputPath) . " > $prettydiffPath";
</span><span class="cx">
</span><del>-if (isAppleMacWebKit()) {
</del><ins>+if (isAppleCocoaWebKit()) {
</ins><span class="cx"> system "open", $prettydiffPath;
</span><span class="cx"> } elsif (isCygwin()) {
</span><span class="cx"> system "cygstart",$prettydiffPath;
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> my $setSharedPrecompsDir;
</span><span class="cx"> $baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"};
</span><span class="cx">
</span><del>- if (!defined($baseProductDir) and isAppleMacWebKit()) {
</del><ins>+ if (!defined($baseProductDir) and isAppleCocoaWebKit()) {
</ins><span class="cx"> # Silently remove ~/Library/Preferences/xcodebuild.plist which can
</span><span class="cx"> # cause build failure. The presence of
</span><span class="cx"> # ~/Library/Preferences/xcodebuild.plist can prevent xcodebuild from
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> $baseProductDir = "$baseProductDir/$branch";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> $baseProductDir =~ s|^\Q$(SRCROOT)/..\E$|$sourceDir|;
</span><span class="cx"> $baseProductDir =~ s|^\Q$(SRCROOT)/../|$sourceDir/|;
</span><span class="cx"> $baseProductDir =~ s|^~/|$ENV{HOME}/|;
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> determineBaseProductDir();
</span><span class="cx"> determineXcodeSDK();
</span><span class="cx">
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> if (open ARCHITECTURE, "$baseProductDir/Architecture") {
</span><span class="cx"> $architecture = <ARCHITECTURE>;
</span><span class="cx"> close ARCHITECTURE;
</span><span class="lines">@@ -798,7 +798,7 @@
</span><span class="cx">
</span><span class="cx"> $passedArchitecture = undef;
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGV("--32-bit")) {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> # PLATFORM_IOS: Don't run `arch` command inside Simulator environment
</span><span class="cx"> local %ENV = %ENV;
</span><span class="cx"> delete $ENV{DYLD_ROOT_PATH};
</span><span class="lines">@@ -848,7 +848,7 @@
</span><span class="cx"> # Locate Safari.
</span><span class="cx"> sub safariPath
</span><span class="cx"> {
</span><del>- die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit();
</del><ins>+ die "Safari path is only relevant on Apple Mac platform\n" unless isAppleCocoaWebKit();
</ins><span class="cx">
</span><span class="cx"> my $safariPath;
</span><span class="cx">
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> if (isIOSWebKit()) {
</span><span class="cx"> return "$configurationProductDir/$libraryName.framework/$libraryName";
</span><span class="cx"> }
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> return "$configurationProductDir/$libraryName.framework/Versions/A/$libraryName";
</span><span class="cx"> }
</span><span class="cx"> if (isAppleWinWebKit()) {
</span><span class="lines">@@ -906,7 +906,7 @@
</span><span class="cx"> {
</span><span class="cx"> return if isAnyWindows();
</span><span class="cx"> my @frameworks = ("JavaScriptCore", "WebCore");
</span><del>- push(@frameworks, "WebKit") if isAppleMacWebKit(); # FIXME: This seems wrong, all ports should have a WebKit these days.
</del><ins>+ push(@frameworks, "WebKit") if isAppleCocoaWebKit(); # FIXME: This seems wrong, all ports should have a WebKit these days.
</ins><span class="cx"> for my $framework (@frameworks) {
</span><span class="cx"> my $path = builtDylibPathForName($framework);
</span><span class="cx"> die "Can't find built framework at \"$path\".\n" unless -e $path;
</span><span class="lines">@@ -1206,10 +1206,10 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleWebKit()
</span><span class="cx"> {
</span><del>- return isAppleMacWebKit() || isAppleWinWebKit();
</del><ins>+ return isAppleCocoaWebKit() || isAppleWinWebKit();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-sub isAppleMacWebKit()
</del><ins>+sub isAppleCocoaWebKit()
</ins><span class="cx"> {
</span><span class="cx"> return (portName() eq Mac) || isIOSWebKit();
</span><span class="cx"> }
</span><span class="lines">@@ -1286,7 +1286,7 @@
</span><span class="cx"> {
</span><span class="cx"> return if $nmPath;
</span><span class="cx">
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> $nmPath = `xcrun -find nm`;
</span><span class="cx"> chomp $nmPath;
</span><span class="cx"> }
</span><span class="lines">@@ -1443,7 +1443,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isGtk() || isEfl()) {
</span><span class="cx"> return "MiniBrowser";
</span><del>- } elsif (isAppleMacWebKit()) {
</del><ins>+ } elsif (isAppleCocoaWebKit()) {
</ins><span class="cx"> return "Safari";
</span><span class="cx"> } elsif (isAppleWinWebKit()) {
</span><span class="cx"> return "MiniBrowser";
</span><span class="lines">@@ -1781,7 +1781,7 @@
</span><span class="cx"> if (isAnyWindows() || isJSCOnly()) {
</span><span class="cx"> return ();
</span><span class="cx"> }
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> return ("xcrun");
</span><span class="cx"> }
</span><span class="cx"> if (-e getJhbuildPath()) {
</span><span class="lines">@@ -2055,7 +2055,7 @@
</span><span class="cx">
</span><span class="cx"> sub isCMakeBuild()
</span><span class="cx"> {
</span><del>- return 1 unless isAppleMacWebKit();
</del><ins>+ return 1 unless isAppleCocoaWebKit();
</ins><span class="cx"> determineIsCMakeBuild();
</span><span class="cx"> return $isCMakeBuild;
</span><span class="cx"> }
</span><span class="lines">@@ -2163,7 +2163,7 @@
</span><span class="cx"> determineConfigurationProductDir();
</span><span class="cx">
</span><span class="cx"> # Use MobileSafari.app in product directory if present.
</span><del>- if (isAppleMacWebKit() && -d "$configurationProductDir/MobileSafari.app") {
</del><ins>+ if (isAppleCocoaWebKit() && -d "$configurationProductDir/MobileSafari.app") {
</ins><span class="cx"> return "$configurationProductDir/MobileSafari.app";
</span><span class="cx"> }
</span><span class="cx"> return installedMobileSafariBundle();
</span><span class="lines">@@ -2467,7 +2467,7 @@
</span><span class="cx">
</span><span class="cx"> sub debugSafari
</span><span class="cx"> {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> checkFrameworks();
</span><span class="cx"> execMacWebKitAppForDebugging(safariPath());
</span><span class="cx"> }
</span><span class="lines">@@ -2481,7 +2481,7 @@
</span><span class="cx"> return runIOSWebKitApp(mobileSafariBundle());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> return runMacWebKitApp(safariPath());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2496,7 +2496,7 @@
</span><span class="cx">
</span><span class="cx"> sub runMiniBrowser
</span><span class="cx"> {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> return runMacWebKitApp(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
</span><span class="cx"> } elsif (isAppleWinWebKit()) {
</span><span class="cx"> my $result;
</span><span class="lines">@@ -2509,7 +2509,7 @@
</span><span class="cx">
</span><span class="cx"> sub debugMiniBrowser
</span><span class="cx"> {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2518,7 +2518,7 @@
</span><span class="cx">
</span><span class="cx"> sub runWebKitTestRunner
</span><span class="cx"> {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunner"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2527,7 +2527,7 @@
</span><span class="cx">
</span><span class="cx"> sub debugWebKitTestRunner
</span><span class="cx"> {
</span><del>- if (isAppleMacWebKit()) {
</del><ins>+ if (isAppleCocoaWebKit()) {
</ins><span class="cx"> execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "WebKitTestRunner"));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (211997 => 211998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-02-09 23:39:58 UTC (rev 211997)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2017-02-09 23:46:56 UTC (rev 211998)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> my @features = (
</span><span class="cx"> { option => "3d-rendering", desc => "Toggle 3D Rendering support",
</span><del>- define => "ENABLE_3D_TRANSFORMS", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDTransformsSupport },
</del><ins>+ define => "ENABLE_3D_TRANSFORMS", default => (isAppleCocoaWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$threeDTransformsSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
</span><span class="cx"> define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> define => "ENABLE_FTPDIR", default => 1, value => \$ftpDirSupport },
</span><span class="cx">
</span><span class="cx"> { option => "fullscreen-api", desc => "Toggle Fullscreen API support",
</span><del>- define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
</del><ins>+ define => "ENABLE_FULLSCREEN_API", default => (isAppleCocoaWebKit() || isEfl() || isGtk()), value => \$fullscreenAPISupport },
</ins><span class="cx">
</span><span class="cx"> { option => "gamepad", desc => "Toggle Gamepad support",
</span><span class="cx"> define => "ENABLE_GAMEPAD", default => 0, value => \$gamepadSupport },
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> define => "ENABLE_ICONDATABASE", default => !isIOSWebKit(), value => \$icondatabaseSupport },
</span><span class="cx">
</span><span class="cx"> { option => "indexed-database", desc => "Toggle Indexed Database support",
</span><del>- define => "ENABLE_INDEXED_DATABASE", default => (isAppleMacWebKit() || isEfl() || isGtk()), value => \$indexedDatabaseSupport },
</del><ins>+ define => "ENABLE_INDEXED_DATABASE", default => (isAppleCocoaWebKit() || isEfl() || isGtk()), value => \$indexedDatabaseSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "input-speech", desc => "Toggle Input Speech support",
</span><span class="cx"> define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> define => "ENABLE_SCRIPTED_SPEECH", default => 0, value => \$scriptedSpeechSupport },
</span><span class="cx">
</span><span class="cx"> { option => "subtle-crypto", desc => "Toggle WebCrypto Subtle-Crypto support",
</span><del>- define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isEfl() || isAppleMacWebKit() || isIOSWebKit()), value => \$subtleCrypto },
</del><ins>+ define => "ENABLE_SUBTLE_CRYPTO", default => (isGtk() || isEfl() || isAppleCocoaWebKit() || isIOSWebKit()), value => \$subtleCrypto },
</ins><span class="cx">
</span><span class="cx"> { option => "svg-fonts", desc => "Toggle SVG Fonts support",
</span><span class="cx"> define => "ENABLE_SVG_FONTS", default => 1, value => \$svgFontsSupport },
</span><span class="lines">@@ -396,10 +396,10 @@
</span><span class="cx"> define => "ENABLE_WEB_AUDIO", default => (isEfl() || isGtk()), value => \$webAudioSupport },
</span><span class="cx">
</span><span class="cx"> { option => "web-replay", desc => "Toggle Web Replay support",
</span><del>- define => "ENABLE_WEB_REPLAY", default => isAppleMacWebKit(), value => \$webReplaySupport },
</del><ins>+ define => "ENABLE_WEB_REPLAY", default => isAppleCocoaWebKit(), value => \$webReplaySupport },
</ins><span class="cx">
</span><span class="cx"> { option => "web-rtc", desc => "Toggle WebRTC support",
</span><del>- define => "ENABLE_WEB_RTC", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk()), value => \$webRTCSupport },
</del><ins>+ define => "ENABLE_WEB_RTC", default => (isAppleCocoaWebKit() || isIOSWebKit() || isGtk()), value => \$webRTCSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "web-sockets", desc => "Toggle Web Sockets support",
</span><span class="cx"> define => "ENABLE_WEB_SOCKETS", default => 1, value => \$webSocketsSupport },
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> define => "ENABLE_WEBASSEMBLY", default => 0, value => \$webAssemblySupport },
</span><span class="cx">
</span><span class="cx"> { option => "webgl", desc => "Toggle WebGL support",
</span><del>- define => "ENABLE_WEBGL", default => (isAppleMacWebKit() || isIOSWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</del><ins>+ define => "ENABLE_WEBGL", default => (isAppleCocoaWebKit() || isGtk() || isEfl()), value => \$webglSupport },
</ins><span class="cx">
</span><span class="cx"> { option => "writableStreamAPI", desc => "Toggle WritableStream API support",
</span><span class="cx"> define => "ENABLE_WRITABLE_STREAM_API", default => 1, value => \$writableStreamAPISupport },
</span></span></pre>
</div>
</div>
</body>
</html>