<!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>[178656] 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/178656">178656</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-19 11:04:53 -0800 (Mon, 19 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
<http://webkit.org/b/140623>
Reviewed by Daniel Bates.
* Scripts/build-webkit: Update help for --device switch.
* Scripts/webkitdirs.pm:
(determineXcodeSDK): When passing --device, prefer the internal
iOS SDK if it exists, else fall back to the external iOS SDK.
(buildXCodeProject): Use xcodeSDK() as -sdk argument for
xcodebuild instead of trying to sanitize values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</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 (178655 => 178656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-19 18:50:55 UTC (rev 178655)
+++ trunk/Tools/ChangeLog 2015-01-19 19:04:53 UTC (rev 178656)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-19 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Do not hard-code iphoneos.internal SDK in buildXCodeProject()
+ <http://webkit.org/b/140623>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/build-webkit: Update help for --device switch.
+ * Scripts/webkitdirs.pm:
+ (determineXcodeSDK): When passing --device, prefer the internal
+ iOS SDK if it exists, else fall back to the external iOS SDK.
+ (buildXCodeProject): Use xcodeSDK() as -sdk argument for
+ xcodebuild instead of trying to sanitize values.
+
</ins><span class="cx"> 2015-01-19 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> "Unknown option: sharedworkerglobalscopeconstructorsfile" when running bindings tests.
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (178655 => 178656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-01-19 18:50:55 UTC (rev 178655)
+++ trunk/Tools/Scripts/build-webkit 2015-01-19 19:04:53 UTC (rev 178656)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> --debug Compile with Debug configuration
</span><span class="cx"> --release Compile with Release configuration
</span><span class="cx"> --sdk=<sdk> Use a specific Xcode SDK (iOS and Mac only)
</span><del>- --device Use the current iphoneos.internal SDK (iOS only)
</del><ins>+ --device Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
</ins><span class="cx"> --simulator Use the current iphonesimulator SDK (iOS only)
</span><span class="cx"> --coverage Enable code coverage support (Mac only)
</span><span class="cx"> --analyze Enable static anaylsis (iOS and Mac only)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (178655 => 178656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-01-19 18:50:55 UTC (rev 178655)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-01-19 19:04:53 UTC (rev 178656)
</span><span class="lines">@@ -434,7 +434,8 @@
</span><span class="cx"> $xcodeSDK = $sdk;
</span><span class="cx"> }
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGV("--device")) {
</span><del>- $xcodeSDK ||= 'iphoneos.internal';
</del><ins>+ my $hasInternalSDK = exitStatus(system("xcrun --sdk iphoneos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
+ $xcodeSDK ||= $hasInternalSDK ? "iphoneos.internal" : "iphoneos";
</ins><span class="cx"> }
</span><span class="cx"> if (checkForArgumentAndRemoveFromARGV("--sim") ||
</span><span class="cx"> checkForArgumentAndRemoveFromARGV("--simulator") ||
</span><span class="lines">@@ -1638,8 +1639,7 @@
</span><span class="cx"> push(@extraOptions, "clean");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@extraOptions, ("-sdk", "iphonesimulator")) if willUseIOSSimulatorSDKWhenBuilding();
- push(@extraOptions, ("-sdk", "iphoneos.internal")) if willUseIOSDeviceSDKWhenBuilding();
</del><ins>+ push(@extraOptions, ("-sdk", xcodeSDK())) if isIOSWebKit();
</ins><span class="cx">
</span><span class="cx"> chomp($ENV{DSYMUTIL_NUM_THREADS} = `sysctl -n hw.activecpu`);
</span><span class="cx"> return system "xcodebuild", "-project", "$project.xcodeproj", @extraOptions;
</span></span></pre>
</div>
</div>
</body>
</html>