<!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>[192371] 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/192371">192371</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-12 11:22:02 -0800 (Thu, 12 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() to willUseIOS{Device, Simulator}SDK()
https://bugs.webkit.org/show_bug.cgi?id=151207
Rubber-stamped by Alexey Proskuryakov.
The functions webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() are not specific to building
iOS software. We should rename these functions to webkitdirs::willUseIOS{Device, Simulator}SDK() to
convey their general-purpose nature of determining whether we are using the iphoneos or iphonesimulator SDK.
* Scripts/build-jsc:
* Scripts/build-layouttestrelay:
* Scripts/build-webkit:
* Scripts/copy-webkitlibraries-to-product-directory:
* Scripts/run-api-tests:
(runTest):
(prepareEnvironmentForRunningTestTool):
* Scripts/run-javascriptcore-tests:
* Scripts/webkitdirs.pm:
(XcodeOptions):
(willUseIOSDeviceSDK): Formerly named willUseIOSDeviceSDKWhenBuilding.
(willUseIOSSimulatorSDK): Formerly name willUseIOSSimulatorSDKWhenBuilding.
(isIOSWebKit):
(runIOSWebKitApp):
(willUseIOSDeviceSDKWhenBuilding): Deleted.
(willUseIOSSimulatorSDKWhenBuilding): Deleted.</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="#trunkToolsScriptsbuildlayouttestrelay">trunk/Tools/Scripts/build-layouttestrelay</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptscopywebkitlibrariestoproductdirectory">trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory</a></li>
<li><a href="#trunkToolsScriptsrunapitests">trunk/Tools/Scripts/run-api-tests</a></li>
<li><a href="#trunkToolsScriptsrunjavascriptcoretests">trunk/Tools/Scripts/run-javascriptcore-tests</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 (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/ChangeLog 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-11-12 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Rename webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() to willUseIOS{Device, Simulator}SDK()
+ https://bugs.webkit.org/show_bug.cgi?id=151207
+
+ Rubber-stamped by Alexey Proskuryakov.
+
+ The functions webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() are not specific to building
+ iOS software. We should rename these functions to webkitdirs::willUseIOS{Device, Simulator}SDK() to
+ convey their general-purpose nature of determining whether we are using the iphoneos or iphonesimulator SDK.
+
+ * Scripts/build-jsc:
+ * Scripts/build-layouttestrelay:
+ * Scripts/build-webkit:
+ * Scripts/copy-webkitlibraries-to-product-directory:
+ * Scripts/run-api-tests:
+ (runTest):
+ (prepareEnvironmentForRunningTestTool):
+ * Scripts/run-javascriptcore-tests:
+ * Scripts/webkitdirs.pm:
+ (XcodeOptions):
+ (willUseIOSDeviceSDK): Formerly named willUseIOSDeviceSDKWhenBuilding.
+ (willUseIOSSimulatorSDK): Formerly name willUseIOSSimulatorSDKWhenBuilding.
+ (isIOSWebKit):
+ (runIOSWebKitApp):
+ (willUseIOSDeviceSDKWhenBuilding): Deleted.
+ (willUseIOSSimulatorSDKWhenBuilding): Deleted.
+
+2015-11-12 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> run-api-tests fails to run with public iOS SDK
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151076
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-jsc (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-jsc 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/build-jsc 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $showHelp = 0;
</span><del>-my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDKWhenBuilding());
</del><ins>+my $ftlJIT = int(isAppleMacWebKit() && !willUseIOSSimulatorSDK());
</ins><span class="cx"> my $forceCLoop = 0;
</span><span class="cx"> my $cli = 0;
</span><span class="cx"> my $makeArgs = "";
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> if ($copyLibraries) {
</span><span class="cx"> my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory");
</span><del>- push @copyLibrariesArgs, "--device" if willUseIOSDeviceSDKWhenBuilding();
</del><ins>+ push @copyLibrariesArgs, "--device" if willUseIOSDeviceSDK();
</ins><span class="cx"> if ($ftlJIT) {
</span><span class="cx"> push @copyLibrariesArgs, "--llvm";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsbuildlayouttestrelay"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-layouttestrelay (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-layouttestrelay 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/build-layouttestrelay 2015-11-12 19:22:02 UTC (rev 192371)
</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() && !willUseIOSDeviceSDKWhenBuilding()) {
</del><ins>+if (isAppleMacWebKit() && !willUseIOSDeviceSDK()) {
</ins><span class="cx"> setXcodeSDK(undef); # Force use of Mac SDK if --ios-simulator was passed
</span><span class="cx"> exit exitStatus(buildXCodeProject("LayoutTestRelay", $clean, XcodeOptions(), @ARGV));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/build-webkit 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span><span class="cx"> } else {
</span><span class="cx"> my @copyLibrariesArgs = ("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", "--sdk", xcodeSDK(), "--wksi");
</span><del>- push @copyLibrariesArgs, "--llvm" if willUseIOSDeviceSDKWhenBuilding();
</del><ins>+ push @copyLibrariesArgs, "--llvm" if willUseIOSDeviceSDK();
</ins><span class="cx"> if (my $hasInternalSDK = xcodeSDK() eq "iphoneos.internal") {
</span><span class="cx"> push @copyLibrariesArgs, (
</span><span class="cx"> "--prefer-system-llvm",
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> print(join(" ", @copyLibrariesArgs) . "\n");
</span><span class="cx"> (system(@copyLibrariesArgs) == 0) or die;
</span><span class="cx">
</span><del>- if (willUseIOSSimulatorSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSSimulatorSDK()) {
</ins><span class="cx"> (system("perl", "Tools/Scripts/build-layouttestrelay", argumentsForConfiguration()) == 0) or die;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptscopywebkitlibrariestoproductdirectory"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/copy-webkitlibraries-to-product-directory 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> my $useFullLibPaths = 0;
</span><span class="cx"> my $preferSystemLLVMOverDrops = 0;
</span><span class="cx"> my $llvmSubdirectoryName = "llvm";
</span><del>-my $llvmPrefix = willUseIOSDeviceSDKWhenBuilding() ? "/usr/local" : "/usr/local/LLVMForJavaScriptCore";
</del><ins>+my $llvmPrefix = willUseIOSDeviceSDK() ? "/usr/local" : "/usr/local/LLVMForJavaScriptCore";
</ins><span class="cx"> my $osxVersion;
</span><span class="cx"> my $force = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsrunapitests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-api-tests (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-api-tests 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/run-api-tests 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> setPathForRunningWebKitApp(\%ENV);
</span><span class="cx">
</span><span class="cx"> my $simulatorDevice;
</span><del>-if (willUseIOSSimulatorSDKWhenBuilding()) {
</del><ins>+if (willUseIOSSimulatorSDK()) {
</ins><span class="cx"> $simulatorDevice = findOrCreateSimulatorForIOSDevice(SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT);
</span><span class="cx"> restartIOSSimulatorDevice($simulatorDevice);
</span><span class="cx"> }
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> foreach(testToolPaths()) {
</span><span class="cx"> my $pid;
</span><span class="cx"> my @commonArguments = ($_, $gtestArg, @ARGV);
</span><del>- if (willUseIOSSimulatorSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSSimulatorSDK()) {
</ins><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><span class="cx"> } elsif (isAppleMacWebKit() && architecture()) {
</span><span class="cx"> $pid = open3($childIn, $childOut, $childErr, "arch", "-" . architecture(), archCommandLineArgumentsForRestrictedEnvironmentVariables(), @commonArguments) or die "Failed to run test: $test.";
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> {
</span><span class="cx"> return unless isAppleMacWebKit();
</span><span class="cx">
</span><del>- if (willUseIOSSimulatorSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSSimulatorSDK()) {
</ins><span class="cx"> my %simulatorENV;
</span><span class="cx"> {
</span><span class="cx"> local %ENV;
</span></span></pre></div>
<a id="trunkToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-javascriptcore-tests (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-javascriptcore-tests 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/run-javascriptcore-tests 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> chdirWebKit();
</span><span class="cx"> chdir($productDir) or die "Failed to switch directory to '$productDir'\n";
</span><span class="cx"> my @command = (testapiPath($productDir));
</span><del>- unshift @command, ("xcrun", "-sdk", xcodeSDK(), "sim") if willUseIOSSimulatorSDKWhenBuilding();
</del><ins>+ unshift @command, ("xcrun", "-sdk", xcodeSDK(), "sim") if willUseIOSSimulatorSDK();
</ins><span class="cx">
</span><span class="cx"> if ($envVars ne "") {
</span><span class="cx"> foreach my $var (split(/\s+/, $envVars)) {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (192370 => 192371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-11-12 19:19:40 UTC (rev 192370)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-11-12 19:22:02 UTC (rev 192371)
</span><span class="lines">@@ -84,6 +84,8 @@
</span><span class="cx"> &sharedCommandLineOptions
</span><span class="cx"> &sharedCommandLineOptionsUsage
</span><span class="cx"> &shutDownIOSSimulatorDevice
</span><ins>+ &willUseIOSDeviceSDK
+ &willUseIOSSimulatorSDK
</ins><span class="cx"> SIMULATOR_DEVICE_SUFFIX_FOR_WEBKIT_DEVELOPMENT
</span><span class="cx"> USE_OPEN_COMMAND
</span><span class="cx"> );
</span><span class="lines">@@ -704,7 +706,7 @@
</span><span class="cx"> push @options, @baseProductDirOption;
</span><span class="cx"> push @options, "ARCHS=$architecture" if $architecture;
</span><span class="cx"> push @options, "SDKROOT=$xcodeSDK" if $xcodeSDK;
</span><del>- if (willUseIOSDeviceSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSDeviceSDK()) {
</ins><span class="cx"> push @options, "ENABLE_BITCODE=NO";
</span><span class="cx"> if (hasIOSDevelopmentCertificate()) {
</span><span class="cx"> # FIXME: May match more than one installed development certificate.
</span><span class="lines">@@ -1232,12 +1234,12 @@
</span><span class="cx"> die "Device $name $deviceTypeId $runtimeId wasn't found in " . iOSSimulatorDevicesPath();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub willUseIOSDeviceSDKWhenBuilding()
</del><ins>+sub willUseIOSDeviceSDK()
</ins><span class="cx"> {
</span><span class="cx"> return xcodeSDKPlatformName() eq "iphoneos";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub willUseIOSSimulatorSDKWhenBuilding()
</del><ins>+sub willUseIOSSimulatorSDK()
</ins><span class="cx"> {
</span><span class="cx"> return xcodeSDKPlatformName() eq "iphonesimulator";
</span><span class="cx"> }
</span><span class="lines">@@ -1245,7 +1247,7 @@
</span><span class="cx"> sub isIOSWebKit()
</span><span class="cx"> {
</span><span class="cx"> determineXcodeSDK();
</span><del>- return isAppleMacWebKit() && (willUseIOSDeviceSDKWhenBuilding() || willUseIOSSimulatorSDKWhenBuilding());
</del><ins>+ return isAppleMacWebKit() && (willUseIOSDeviceSDK() || willUseIOSSimulatorSDK());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub determineNmPath()
</span><span class="lines">@@ -2416,10 +2418,10 @@
</span><span class="cx"> sub runIOSWebKitApp($)
</span><span class="cx"> {
</span><span class="cx"> my ($appBundle) = @_;
</span><del>- if (willUseIOSDeviceSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSDeviceSDK()) {
</ins><span class="cx"> die "Only running Safari in iOS Simulator is supported now.";
</span><span class="cx"> }
</span><del>- if (willUseIOSSimulatorSDKWhenBuilding()) {
</del><ins>+ if (willUseIOSSimulatorSDK()) {
</ins><span class="cx"> return runIOSWebKitAppInSimulator($appBundle);
</span><span class="cx"> }
</span><span class="cx"> die "Not using an iOS SDK."
</span></span></pre>
</div>
</div>
</body>
</html>