<!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>[178866] 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/178866">178866</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 15:21:59 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Update configure-xcode-for-ios-development to copy missing headers to iphoneos SDK
<http://webkit.org/b/140704>
Reviewed by Daniel Bates.
* Scripts/configure-xcode-for-ios-development:
- Update copyright.
- Remove FIXME addressed by <a href="http://trac.webkit.org/projects/webkit/changeset/178709">r178709</a>.
- Call copyMissingHeadersToIPhoneOSSDKIfNeeded().
(copyMissingHeadersToIPhoneOSSDKIfNeeded): Add method to copy
missing headers from iphonesimulator SDK to iphoneos SDK.
(sdkDirectory): Add method that returns SDK directory.
(sdkPlatformDirectory): Extract method from
xcodeSDKSpecificationsPath() that returns SDK platform
directory.
(xcodeSDKSpecificationsPath): Update to use
sdkPlatformDirectory().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsconfigurexcodeforiosdevelopment">trunk/Tools/Scripts/configure-xcode-for-ios-development</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178865 => 178866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-21 23:14:48 UTC (rev 178865)
+++ trunk/Tools/ChangeLog 2015-01-21 23:21:59 UTC (rev 178866)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-01-21 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] Update configure-xcode-for-ios-development to copy missing headers to iphoneos SDK
+ <http://webkit.org/b/140704>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/configure-xcode-for-ios-development:
+ - Update copyright.
+ - Remove FIXME addressed by r178709.
+ - Call copyMissingHeadersToIPhoneOSSDKIfNeeded().
+ (copyMissingHeadersToIPhoneOSSDKIfNeeded): Add method to copy
+ missing headers from iphonesimulator SDK to iphoneos SDK.
+ (sdkDirectory): Add method that returns SDK directory.
+ (sdkPlatformDirectory): Extract method from
+ xcodeSDKSpecificationsPath() that returns SDK platform
+ directory.
+ (xcodeSDKSpecificationsPath): Update to use
+ sdkPlatformDirectory().
+
</ins><span class="cx"> 2015-01-21 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> https://build.webkit.org/dashboard/metrics.html fails because of ios-ews
</span></span></pre></div>
<a id="trunkToolsScriptsconfigurexcodeforiosdevelopment"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/configure-xcode-for-ios-development (178865 => 178866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/configure-xcode-for-ios-development 2015-01-21 23:14:48 UTC (rev 178865)
+++ trunk/Tools/Scripts/configure-xcode-for-ios-development 2015-01-21 23:21:59 UTC (rev 178866)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> # tool product- and package- type using the definitions in the OS X SDK for the
</span><span class="cx"> # same types.
</span><span class="cx">
</span><del>-# FIXME: We should also configure Xcode to support building a command line tool for an iOS device.
-
</del><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><span class="lines">@@ -38,8 +36,11 @@
</span><span class="cx"> use File::Spec;
</span><span class="cx"> use File::Temp qw(tempfile);
</span><span class="cx">
</span><ins>+sub copyMissingHeadersToIPhoneOSSDKIfNeeded();
</ins><span class="cx"> sub createXcodeSpecificationFilesForSDKIfNeeded($);
</span><span class="cx"> sub createXcodeSpecificationFromSpecificationAndId($$$);
</span><ins>+sub sdkDirectory($);
+sub sdkPlatformDirectory($);
</ins><span class="cx"> sub readXcodeSpecificationById($$);
</span><span class="cx"> sub xcodeSDKSpecificationsPath($);
</span><span class="cx">
</span><span class="lines">@@ -58,8 +59,40 @@
</span><span class="cx"> createXcodeSpecificationFilesForSDKIfNeeded($sdk);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+copyMissingHeadersToIPhoneOSSDKIfNeeded();
+
</ins><span class="cx"> exit 0;
</span><span class="cx">
</span><ins>+sub copyMissingHeadersToIPhoneOSSDKIfNeeded()
+{
+ my @missingHeaders = qw(
+ /usr/include/crt_externs.h
+ /usr/include/MacErrors.h
+ /usr/include/mach/mach_types.defs
+ /usr/include/mach/machine/machine_types.defs
+ /usr/include/mach/std_types.defs
+ /usr/include/objc/objc-class.h
+ /usr/include/objc/objc-runtime.h
+ /usr/include/objc/Protocol.h
+ /usr/include/readline/history.h
+ /usr/include/readline/readline.h
+ /usr/include/sqlite3_private.h
+ );
+
+ my $iphoneosSDKDirectory = sdkDirectory("iphoneos");
+ my $iphonesimulatorSDKDirectory = sdkDirectory("iphonesimulator");
+
+ for my $header (@missingHeaders) {
+ my $iphoneosSDKPath = File::Spec->canonpath(File::Spec->catfile($iphoneosSDKDirectory, $header));
+ next if (-f $iphoneosSDKPath);
+
+ my $iphonesimulatorSDKPath = File::Spec->canonpath(File::Spec->catfile($iphonesimulatorSDKDirectory, $header));
+ system("/usr/bin/ditto", $iphonesimulatorSDKPath, $iphoneosSDKPath);
+ die "Could not copy $iphonesimulatorSDKPath to $iphoneosSDKPath: $!" if exitStatus($?);
+ print "Successfully copied $iphonesimulatorSDKPath to $iphoneosSDKPath.\n";
+ }
+}
+
</ins><span class="cx"> sub createXcodeSpecificationFilesForSDKIfNeeded($)
</span><span class="cx"> {
</span><span class="cx"> my ($sdk) = @_;
</span><span class="lines">@@ -119,6 +152,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub sdkDirectory($)
+{
+ my ($sdkName) = @_;
+ chomp(my $sdkDirectory = `xcrun --sdk '$sdkName' --show-sdk-path`);
+ die "Failed to get SDK path from xcrun: $!" if exitStatus($?);
+ return $sdkDirectory;
+}
+
+sub sdkPlatformDirectory($)
+{
+ my ($sdkName) = @_;
+ chomp(my $sdkPlatformDirectory = `xcrun --sdk '$sdkName' --show-sdk-platform-path`);
+ die "Failed to get SDK platform path from xcrun: $!" if exitStatus($?);
+ return $sdkPlatformDirectory;
+}
+
</ins><span class="cx"> sub writeXcodeSpecification($$)
</span><span class="cx"> {
</span><span class="cx"> my ($xcodeSpecificationFile, $specification) = @_;
</span><span class="lines">@@ -177,10 +226,8 @@
</span><span class="cx"> sub xcodeSDKSpecificationsPath($)
</span><span class="cx"> {
</span><span class="cx"> my ($sdkName) = @_;
</span><del>- chomp(my $sdkPlatformDirectory = `xcrun --sdk '$sdkName' --show-sdk-platform-path`);
- die "Failed to get SDK platform path from xcrun" if $?;
</del><span class="cx">
</span><del>- return File::Spec->catdir($sdkPlatformDirectory, "Developer", "Library", "Xcode", "Specifications");
</del><ins>+ return File::Spec->catdir(sdkPlatformDirectory($sdkName), "Developer", "Library", "Xcode", "Specifications");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub createXcodeSpecificationFromSpecificationAndId($$$)
</span></span></pre>
</div>
</div>
</body>
</html>