<!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>[163096] 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/163096">163096</a></dd>
<dt>Author</dt> <dd>dfarler@apple.com</dd>
<dt>Date</dt> <dd>2014-01-30 11:37:32 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable iOS Tools builds by default
https://bugs.webkit.org/show_bug.cgi?id=127919
Reviewed by Andy Estes.
* Makefile:
Build all the tools except MiniBrowser on iOS
* Scripts/build-webkit:
Ditto.
Build WebKitTestRunnerApp target on iOS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeMakefile">trunk/Tools/DumpRenderTree/Makefile</a></li>
<li><a href="#trunkToolsMakefile">trunk/Tools/Makefile</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163095 => 163096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-30 19:34:23 UTC (rev 163095)
+++ trunk/Tools/ChangeLog 2014-01-30 19:37:32 UTC (rev 163096)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-30 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><ins>+ Enable iOS Tools builds by default
+ https://bugs.webkit.org/show_bug.cgi?id=127919
+
+ Reviewed by Andy Estes.
+
+ * Makefile:
+ Build all the tools except MiniBrowser on iOS
+ * Scripts/build-webkit:
+ Ditto.
+ Build WebKitTestRunnerApp target on iOS.
+
+2014-01-30 David Farler <dfarler@apple.com>
+
</ins><span class="cx"> Make TestWebKitAPI build and run for iOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127925
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/Makefile (163095 => 163096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/Makefile 2014-01-30 19:34:23 UTC (rev 163095)
+++ trunk/Tools/DumpRenderTree/Makefile 2014-01-30 19:37:32 UTC (rev 163096)
</span><span class="lines">@@ -1,9 +1,3 @@
</span><span class="cx"> SCRIPTS_PATH = ../Scripts
</span><span class="cx">
</span><del>-ifneq (,$(findstring iphoneos,$(SDKROOT)))
- OTHER_OPTIONS += -target All-iOS
-else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
- OTHER_OPTIONS += -target All-iOS
-endif
-
</del><span class="cx"> include ../../Makefile.shared
</span></span></pre></div>
<a id="trunkToolsMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Makefile (163095 => 163096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Makefile 2014-01-30 19:34:23 UTC (rev 163095)
+++ trunk/Tools/Makefile 2014-01-30 19:37:32 UTC (rev 163096)
</span><span class="lines">@@ -1,9 +1,7 @@
</span><span class="cx"> MODULES = DumpRenderTree WebKitTestRunner MiniBrowser ../Source/ThirdParty/gtest/xcode TestWebKitAPI
</span><span class="cx">
</span><span class="cx"> ifneq (,$(findstring iphone,$(SDKROOT)))
</span><del>- # FIXME: Build projects ../Source/ThirdParty/gtest/xcode, TestWebKitAPI for both device and simulator
- # and build project DumpRenderTree for simulator.
- MODULES = WebKitTestRunner
</del><ins>+ MODULES = DumpRenderTree WebKitTestRunner ../Source/ThirdParty/gtest/xcode TestWebKitAPI
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> all:
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (163095 => 163096)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-01-30 19:34:23 UTC (rev 163095)
+++ trunk/Tools/Scripts/build-webkit 2014-01-30 19:37:32 UTC (rev 163096)
</span><span class="lines">@@ -219,18 +219,15 @@
</span><span class="cx"> # WebInspectorUI must come before WebKit and WebKit2
</span><span class="cx"> unshift @projects, ("Source/WebInspectorUI");
</span><span class="cx">
</span><del>- # Build Tools needed for Apple ports
- push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
-
</del><span class="cx"> # Copy library and header from WebKitLibraries to a findable place in the product directory.
</span><span class="cx"> (system("perl", "Tools/Scripts/copy-webkitlibraries-to-product-directory", $productDir) == 0) or die;
</span><span class="cx"> } else {
</span><span class="cx"> push @projects, ("Source/WebKit2") if !$noWebKit2;
</span><ins>+ }
</ins><span class="cx">
</span><del>- # Build Tools needed for Apple ports
- # FIXME: <rdar://problem/11784024> WebKitTestRunner should build for iOS
- # FIXME: Build projects Tools/DumpRenderTree, Source/ThirdParty/gtest, and Tools/TestWebKitAPI
- }
</del><ins>+ # Build Tools needed for Apple ports
+ push @projects, ("Tools/DumpRenderTree", "Tools/WebKitTestRunner", "Source/ThirdParty/gtest", "Tools/TestWebKitAPI");
+
</ins><span class="cx"> } elsif (isWinCairo()) {
</span><span class="cx"> (system("perl Tools/Scripts/update-webkit-wincairo-libs") == 0) or die;
</span><span class="cx"> } elsif (isAppleWinWebKit()) {
</span><span class="lines">@@ -288,6 +285,9 @@
</span><span class="cx"> my @local_options = @options;
</span><span class="cx"> push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
</span><span class="cx"> my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
</span><ins>+ if (isIOSWebKit()){
+ push @local_options, qw(-target WebKitTestRunnerApp) if ($project eq "WebKitTestRunner") && !$clean;
+ }
</ins><span class="cx"> $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
</span><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> if ($project eq "WebKit") {
</span></span></pre>
</div>
</div>
</body>
</html>