<!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>[189455] 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/189455">189455</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-09-06 22:39:42 -0700 (Sun, 06 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKitTestRunner should build for iOS using the default target
https://bugs.webkit.org/show_bug.cgi?id=148918
Reviewed by Daniel Bates.
When WebKitTestRunner was ported to iOS, a separate target (WebKitTestRunnerApp) was created for building the
iOS variant. This is annoying because (1) all tools that invoke xcodebuild need to be taught to build this
non-default target, and (2) a single Xcode scheme cannot be used to build both Mac and iOS variants.
This change adds a new default target (All) and makes it work for both Mac and iOS. Files that were built for
both WebKitTestRunner and WebKitTestRunnerApp are now built in a static library target (WebKitTestRunner (Library)),
and both apps now link this library. Files that are specific to Mac or iOS are excluded on the other platform.
WebKitTestRunnerApp.app (which should be renamed to WebKitTestRunner.app) is skipped when installing on Mac, and
WebKitTestRunner is skipped when installing on iOS.
The target dependency graph now looks like this:
All
WebKitTestRunnerApp
WebKitTestRunner (Library)
WebKitTestRunnerInjectedBundle
Derived Sources
WebKitTestRunner
WebKitTestRunner (Library)
WebKitTestRunnerInjectedBundle
Derived Sources
* Scripts/build-webkit: Stopped building the WebKitTestRunnerApp target on iOS.
* Scripts/build-webkittestrunner: Ditto.
* WebKitTestRunner/Configurations/Base.xcconfig: Set SUPPORTED_PLATFORMS to macosx, iphoneos, and iphonesimulator.
* WebKitTestRunner/Configurations/BaseTarget.xcconfig: Set INSTALL_PATH here since it is the same for all targets.
* WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Stopped setting INSTALL_PATH.
* WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Moved frameworks from the build phase to here,
excluded iOS-only files, and skipped installing on iOS.
* WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: Moved frameworks from the build phase to here,
excluded Mac-only files, and skipped installing on Mac.
* WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig: Skipped installing always.
* WebKitTestRunner/Makefile: Stopped building the WebKitTestRunnerApp target on iOS.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Added new targets, removed frameworks from
Link Binary With Libraries builds phases, moved common files to the WebKitTestRunner (Library) target, and added
new configuration files.</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="#trunkToolsScriptsbuildwebkittestrunner">trunk/Tools/Scripts/build-webkittestrunner</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsBasexcconfig">trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsBaseTargetxcconfig">trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsInjectedBundlexcconfig">trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerxcconfig">trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerMakefile">trunk/Tools/WebKitTestRunner/Makefile</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj">trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerAppxcconfig">trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerLibraryxcconfig">trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/ChangeLog 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-09-06 Andy Estes <aestes@apple.com>
+
+ WebKitTestRunner should build for iOS using the default target
+ https://bugs.webkit.org/show_bug.cgi?id=148918
+
+ Reviewed by Daniel Bates.
+
+ When WebKitTestRunner was ported to iOS, a separate target (WebKitTestRunnerApp) was created for building the
+ iOS variant. This is annoying because (1) all tools that invoke xcodebuild need to be taught to build this
+ non-default target, and (2) a single Xcode scheme cannot be used to build both Mac and iOS variants.
+
+ This change adds a new default target (All) and makes it work for both Mac and iOS. Files that were built for
+ both WebKitTestRunner and WebKitTestRunnerApp are now built in a static library target (WebKitTestRunner (Library)),
+ and both apps now link this library. Files that are specific to Mac or iOS are excluded on the other platform.
+ WebKitTestRunnerApp.app (which should be renamed to WebKitTestRunner.app) is skipped when installing on Mac, and
+ WebKitTestRunner is skipped when installing on iOS.
+
+ The target dependency graph now looks like this:
+
+ All
+ WebKitTestRunnerApp
+ WebKitTestRunner (Library)
+ WebKitTestRunnerInjectedBundle
+ Derived Sources
+ WebKitTestRunner
+ WebKitTestRunner (Library)
+ WebKitTestRunnerInjectedBundle
+ Derived Sources
+
+ * Scripts/build-webkit: Stopped building the WebKitTestRunnerApp target on iOS.
+ * Scripts/build-webkittestrunner: Ditto.
+ * WebKitTestRunner/Configurations/Base.xcconfig: Set SUPPORTED_PLATFORMS to macosx, iphoneos, and iphonesimulator.
+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig: Set INSTALL_PATH here since it is the same for all targets.
+ * WebKitTestRunner/Configurations/InjectedBundle.xcconfig: Stopped setting INSTALL_PATH.
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Moved frameworks from the build phase to here,
+ excluded iOS-only files, and skipped installing on iOS.
+ * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig: Moved frameworks from the build phase to here,
+ excluded Mac-only files, and skipped installing on Mac.
+ * WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig: Skipped installing always.
+ * WebKitTestRunner/Makefile: Stopped building the WebKitTestRunnerApp target on iOS.
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Added new targets, removed frameworks from
+ Link Binary With Libraries builds phases, moved common files to the WebKitTestRunner (Library) target, and added
+ new configuration files.
+
</ins><span class="cx"> 2015-09-05 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Improve prepare-ChangeLog for multiple cases
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/Scripts/build-webkit 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -253,9 +253,6 @@
</span><span class="cx"> push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
</span><span class="cx"> push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
</span><span class="cx"> my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
</span><del>- if (isIOSWebKit()){
- push @local_options, qw(-target WebKitTestRunnerApp) if ($project eq "WebKitTestRunner") && !$clean;
- }
</del><span class="cx"> $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
</span><span class="cx"> } elsif (isAppleWinWebKit() || isWinCairo()) {
</span><span class="cx"> chdirWebKit();
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkittestrunner"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkittestrunner (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkittestrunner 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/Scripts/build-webkittestrunner 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -60,8 +60,7 @@
</span><span class="cx">
</span><span class="cx"> my $result;
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><del>- my @target = isIOSWebKit() ? ("-target", "WebKitTestRunnerApp") : ();
- $result = buildXCodeProject("WebKitTestRunner", $clean, XcodeOptions(), (@ARGV, @target));
</del><ins>+ $result = buildXCodeProject("WebKitTestRunner", $clean, XcodeOptions(), @ARGV);
</ins><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 class="cx"> $result = 0;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span><ins>+SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
+
</ins><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span><span class="cx"> WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -23,3 +23,4 @@
</span><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><ins>+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsInjectedBundlexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../..";
</span><span class="cx"> PRODUCT_NAME = WebKitTestRunnerInjectedBundle;
</span><span class="cx">
</span><del>-INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
</del><span class="cx"> SKIP_INSTALL = NO;
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework CoreText -framework QuartzCore;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><del>-// Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
</del><span class="cx"> //
</span><ins>+// Copyright (C) 2010-2015 Apple Inc. All rights reserved.
+//
</ins><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="cx"> // are met:
</span><span class="lines">@@ -9,30 +10,23 @@
</span><span class="cx"> // notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> // documentation and/or other materials provided with the distribution.
</span><span class="cx"> //
</span><del>-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</del><ins>+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+//
</ins><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-PRODUCT_NAME = WebKitTestRunner
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-
-OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY);
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework JavaScriptCore -framework CoreGraphics -framework ImageIO -framework UIKit;
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Carbon -framework Cocoa;
-
-INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
-SKIP_INSTALL = NO;
-
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
-EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIPhone.mm;
</del><ins>+PRODUCT_NAME = WebKitTestRunner;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
+SKIP_INSTALL[sdk=iphone*] = YES;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*;
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerAppxcconfig"></a>
<div class="addfile"><h4>Added: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig (0 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig (rev 0)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+//
+// Copyright (C) 2010-2015 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+//
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebKitTestRunner;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework JavaScriptCore -framework CoreGraphics -framework ImageIO -framework UIKit -framework WebKit -framework Foundation;
+SKIP_INSTALL[sdk=macosx*] = YES;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/* AppDelegate.m;
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsWebKitTestRunnerLibraryxcconfigfromrev189454trunkToolsWebKitTestRunnerConfigurationsBaseTargetxcconfig"></a>
<div class="copfile"><h4>Copied: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig (from rev 189454, trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig) (0 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig (rev 0)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerLibrary.xcconfig 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+//
+// Copyright (C) 2015 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+
+#include "BaseTarget.xcconfig"
+
+PRODUCT_NAME = WebKitTestRunner;
+GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+SKIP_INSTALL = YES;
</ins></span></pre></div>
<a id="trunkToolsWebKitTestRunnerMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Makefile (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Makefile 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/Makefile 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -5,14 +5,6 @@
</span><span class="cx">
</span><span class="cx"> ifeq "$(BUILD_WEBKITTESTRUNNER)" "YES"
</span><span class="cx">
</span><del>-ifneq (,$(SDKROOT))
- ifeq (,$(findstring macosx,$(SDKROOT)))
- ifeq (,$(findstring clean,$(MAKECMDGOALS)))
- OTHER_OPTIONS += -target WebKitTestRunnerApp
- endif
- endif
-endif
-
</del><span class="cx"> SCRIPTS_PATH = ../Scripts
</span><span class="cx"> include ../../Makefile.shared
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (189454 => 189455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-09-07 05:19:28 UTC (rev 189454)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-09-07 05:39:42 UTC (rev 189455)
</span><span class="lines">@@ -21,13 +21,9 @@
</span><span class="cx"> /* End PBXAggregateTarget section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXBuildFile section */
</span><del>- 0F5169CB1445222D00E0A9D7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; };
</del><span class="cx"> 0F5169CC1445222D00E0A9D7 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; };
</span><span class="cx"> 0FEB90A01905A834000FDBF3 /* InjectedBundlePageCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB909E1905A776000FDBF3 /* InjectedBundlePageCocoa.mm */; };
</span><span class="cx"> 0FEB90A51905C016000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; };
</span><del>- 0FEB90A81905C537000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; };
- 0FEB90A91905C548000FDBF3 /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; };
- 26D758E7160BECDD00268472 /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; };
</del><span class="cx"> 29210EAE144CACB700835BB5 /* AccessibilityUIElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EA9144CACB200835BB5 /* AccessibilityUIElement.cpp */; };
</span><span class="cx"> 29210EB0144CACBD00835BB5 /* AccessibilityController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EA2144CAAA500835BB5 /* AccessibilityController.cpp */; };
</span><span class="cx"> 29210EB4144CACD500835BB5 /* AccessibilityTextMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29210EB1144CACD400835BB5 /* AccessibilityTextMarker.cpp */; };
</span><span class="lines">@@ -40,8 +36,6 @@
</span><span class="cx"> 29A8FCDD145F0337009045A6 /* JSAccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1345E7021006AA5A6 /* JSAccessibilityTextMarkerRange.cpp */; };
</span><span class="cx"> 29A8FCE2145F037B009045A6 /* AccessibilityTextMarkerRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE1145F037B009045A6 /* AccessibilityTextMarkerRange.cpp */; };
</span><span class="cx"> 29A8FCE5145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29A8FCE4145F0464009045A6 /* AccessibilityTextMarkerRangeMac.mm */; };
</span><del>- 2DCE2CD31B8452F800C7F832 /* TestControllerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DCE2CD11B84524500C7F832 /* TestControllerCocoa.mm */; };
- 2DCE2CD41B84530A00C7F832 /* TestControllerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DCE2CD11B84524500C7F832 /* TestControllerCocoa.mm */; };
</del><span class="cx"> 2E34C90018B68808000067BB /* WebKitTestRunnerInjectedBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */; };
</span><span class="cx"> 2E63ED8A1891AD7E002A7AFC /* AccessibilityControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED751891ACE9002A7AFC /* AccessibilityControllerIOS.mm */; };
</span><span class="cx"> 2E63ED8B1891AD7E002A7AFC /* AccessibilityTextMarkerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED771891ACE9002A7AFC /* AccessibilityTextMarkerIOS.mm */; };
</span><span class="lines">@@ -50,28 +44,12 @@
</span><span class="cx"> 2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */; };
</span><span class="cx"> 2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */; };
</span><span class="cx"> 2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D161890A9FB0010ED21 /* mainIOS.mm */; };
</span><del>- 2E63ED951891ADC7002A7AFC /* CyclicRedundancyCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4113FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp */; };
- 2E63ED961891ADC7002A7AFC /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; };
- 2E63ED971891ADC7002A7AFC /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4413FDA0EA0041ABCC /* PixelDumpSupport.cpp */; };
- 2E63ED981891ADC7002A7AFC /* TestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC793430118F7F19005EA8E2 /* TestController.cpp */; };
- 2E63ED991891ADC7002A7AFC /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
- 2E63ED9A1891ADC7002A7AFC /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; };
- 2E63ED9B1891ADC7002A7AFC /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; };
</del><span class="cx"> 2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52CF21890A9A80010ED21 /* AppDelegate.m */; };
</span><span class="cx"> 2E63ED9E1891AEC1002A7AFC /* WebArchiveDumpSupportIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */; };
</span><span class="cx"> 2E63EDA11891B291002A7AFC /* AccessibilityUIElementIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED781891ACE9002A7AFC /* AccessibilityUIElementIOS.mm */; };
</span><del>- 2E63EDA51891BD8E002A7AFC /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; };
</del><span class="cx"> 2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
</span><del>- 2E749BEF1891E939007FC175 /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 841CC00D181185BF0042E9B6 /* Options.cpp */; };
</del><span class="cx"> 2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED7A1891ACE9002A7AFC /* EventSenderProxyIOS.mm */; };
</span><del>- 2EE52CE31890A9A80010ED21 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE21890A9A80010ED21 /* Foundation.framework */; };
- 2EE52CE51890A9A80010ED21 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */; };
- 2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2EE52CE61890A9A80010ED21 /* UIKit.framework */; };
</del><span class="cx"> 2EE52CED1890A9A80010ED21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2EE52CEB1890A9A80010ED21 /* InfoPlist.strings */; };
</span><del>- 3164C8F015D1ADA100EF1FE0 /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; };
- 4429FC5F1627089600F66D8B /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; };
- 5322FB4313FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4113FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp */; };
- 5322FB4613FDA0EA0041ABCC /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4413FDA0EA0041ABCC /* PixelDumpSupport.cpp */; };
</del><span class="cx"> 5641E2D014335E95008307E5 /* JSTextInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5641E2CE14335E95008307E5 /* JSTextInputController.cpp */; };
</span><span class="cx"> 5664A49A14326384008881BE /* TextInputController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5664A49814326384008881BE /* TextInputController.cpp */; };
</span><span class="cx"> 5670B8281386FCA5002EB355 /* EventSenderProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5670B8271386FCA5002EB355 /* EventSenderProxy.mm */; };
</span><span class="lines">@@ -90,49 +68,75 @@
</span><span class="cx"> 65EB85A011EC67CC0034D300 /* ActivateFontsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 65EB859F11EC67CC0034D300 /* ActivateFontsCocoa.mm */; };
</span><span class="cx"> 8034C6621487636400AC32E9 /* AccessibilityControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8034C6611487636400AC32E9 /* AccessibilityControllerMac.mm */; };
</span><span class="cx"> 8097338A14874A5A008156D9 /* AccessibilityNotificationHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8097338914874A5A008156D9 /* AccessibilityNotificationHandler.mm */; };
</span><del>- 841CC00F181185BF0042E9B6 /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 841CC00D181185BF0042E9B6 /* Options.cpp */; };
</del><ins>+ A185103A1B9AE0DA00744AEB /* CrashReporterInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB90A31905BC6A000FDBF3 /* CrashReporterInfo.mm */; settings = {ASSET_TAGS = (); }; };
+ A185103B1B9AE0E200744AEB /* TestControllerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DCE2CD11B84524500C7F832 /* TestControllerCocoa.mm */; settings = {ASSET_TAGS = (); }; };
+ A185103C1B9AE0FE00744AEB /* Options.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 841CC00D181185BF0042E9B6 /* Options.cpp */; settings = {ASSET_TAGS = (); }; };
+ A185103D1B9AE10600744AEB /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; settings = {ASSET_TAGS = (); }; };
+ A185103E1B9AE12200744AEB /* CyclicRedundancyCheck.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4113FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp */; settings = {ASSET_TAGS = (); }; };
+ A185103F1B9AE12900744AEB /* GeolocationProviderMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D758E5160BECDC00268472 /* GeolocationProviderMock.cpp */; settings = {ASSET_TAGS = (); }; };
+ A18510401B9AE13100744AEB /* PixelDumpSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5322FB4413FDA0EA0041ABCC /* PixelDumpSupport.cpp */; settings = {ASSET_TAGS = (); }; };
+ A18510411B9AE13800744AEB /* TestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC793430118F7F19005EA8E2 /* TestController.cpp */; settings = {ASSET_TAGS = (); }; };
+ A18510421B9AE13E00744AEB /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; settings = {ASSET_TAGS = (); }; };
+ A18510431B9AE14500744AEB /* WebNotificationProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */; settings = {ASSET_TAGS = (); }; };
+ A18510441B9AE14A00744AEB /* WorkQueueManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4429FC5E1627089600F66D8B /* WorkQueueManager.cpp */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> A664BC7613A5F3A9009A7B25 /* libWebCoreTestSupport.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 41230E16138C78BF00BCCFCA /* libWebCoreTestSupport.dylib */; };
</span><span class="cx"> BC14E4DB120E02D000826C0C /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4D9120E02D000826C0C /* GCController.cpp */; };
</span><span class="cx"> BC14E4EA120E03D800826C0C /* JSGCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14E4E8120E03D800826C0C /* JSGCController.cpp */; };
</span><span class="cx"> BC25194011D15D8B002EBC01 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
</span><span class="cx"> BC251A3E11D16831002EBC01 /* InjectedBundleMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC25184611D15767002EBC01 /* InjectedBundleMain.cpp */; };
</span><span class="cx"> BC793400118F7C84005EA8E2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7933FF118F7C84005EA8E2 /* main.mm */; };
</span><del>- BC793431118F7F19005EA8E2 /* TestController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC793430118F7F19005EA8E2 /* TestController.cpp */; };
</del><span class="cx"> BC7934E811906846005EA8E2 /* PlatformWebViewMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC7934E711906846005EA8E2 /* PlatformWebViewMac.mm */; };
</span><span class="cx"> BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8C795B11D2785D004535A1 /* TestControllerMac.mm */; };
</span><span class="cx"> BC8DAD7B1316D91000EC96FC /* InjectedBundleMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8DAD771316D7B900EC96FC /* InjectedBundleMac.mm */; };
</span><span class="cx"> BC8FD8CA120E527F00F3E71A /* EventSendingController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8FD8C9120E527F00F3E71A /* EventSendingController.cpp */; };
</span><span class="cx"> BC8FD8D2120E545B00F3E71A /* JSEventSendingController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC8FD8D0120E545B00F3E71A /* JSEventSendingController.cpp */; };
</span><del>- BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC9192041333E4F8003011DC /* TestInvocationCG.cpp */; };
</del><span class="cx"> BC952C0D11F3B965003398B4 /* JSWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952C0C11F3B965003398B4 /* JSWrapper.cpp */; };
</span><span class="cx"> BC952F1F11F3C652003398B4 /* JSTestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC952F1D11F3C652003398B4 /* JSTestRunner.cpp */; };
</span><span class="cx"> BCC997A411D3C8F60017BCA2 /* InjectedBundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A011D3C8F60017BCA2 /* InjectedBundle.cpp */; };
</span><span class="cx"> BCC997A511D3C8F60017BCA2 /* InjectedBundlePage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC997A211D3C8F60017BCA2 /* InjectedBundlePage.cpp */; };
</span><del>- BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCD7D2F711921278006DB7EE /* TestInvocation.cpp */; };
- BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCDA2B991191051F00C3BC47 /* JavaScriptCore.framework */; };
</del><span class="cx"> C0CE720B1247C93300BC0EC4 /* TestRunnerMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C0CE720A1247C93300BC0EC4 /* TestRunnerMac.mm */; };
</span><span class="cx"> E132AA3A17CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3817CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm */; };
</span><span class="cx"> E132AA3D17CE776F00611DF0 /* WebKitTestRunnerEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = E132AA3B17CE776F00611DF0 /* WebKitTestRunnerEvent.mm */; };
</span><del>- E1AC69F21AFB3B5B00F6D567 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F5169CA1445222D00E0A9D7 /* WebKit.framework */; };
</del><span class="cx"> E1C642C317CBCC7300D66A3C /* PoseAsClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C117CBCC7300D66A3C /* PoseAsClass.mm */; };
</span><span class="cx"> E1C642C617CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1C642C417CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><del>- 2E63ED881891AD47002A7AFC /* PBXContainerItemProxy */ = {
</del><ins>+ A185101F1B9ADE1400744AEB /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><ins>+ remoteGlobalIDString = 8DD76F960486AA7600D96B5E;
+ remoteInfo = WebKitTestRunner;
+ };
+ A18510211B9ADE1900744AEB /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 2EE52CDF1890A9A80010ED21;
+ remoteInfo = WebKitTestRunnerApp;
+ };
+ A18510311B9ADE5B00744AEB /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
</ins><span class="cx"> remoteGlobalIDString = BC25186111D15D54002EBC01;
</span><span class="cx"> remoteInfo = WebKitTestRunnerInjectedBundle;
</span><span class="cx"> };
</span><del>- BC25194111D15D94002EBC01 /* PBXContainerItemProxy */ = {
</del><ins>+ A18510331B9ADE6200744AEB /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><del>- remoteGlobalIDString = BC25186111D15D54002EBC01;
- remoteInfo = InjectedBundle;
</del><ins>+ remoteGlobalIDString = A18510261B9ADE4800744AEB;
+ remoteInfo = "WebKitTestRunner (Library)";
</ins><span class="cx"> };
</span><ins>+ A18510351B9ADE6D00744AEB /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = A18510261B9ADE4800744AEB;
+ remoteInfo = "WebKitTestRunner (Library)";
+ };
</ins><span class="cx"> BC952ED611F3C38B003398B4 /* PBXContainerItemProxy */ = {
</span><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="lines">@@ -233,6 +237,10 @@
</span><span class="cx"> 841CC00D181185BF0042E9B6 /* Options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Options.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 841CC00E181185BF0042E9B6 /* Options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Options.h; sourceTree = "<group>"; };
</span><span class="cx"> 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
</span><ins>+ A18510181B9ADE0B00744AEB /* All */ = {isa = PBXFileReference; explicitFileType = folder; includeInIndex = 0; path = All; sourceTree = BUILT_PRODUCTS_DIR; };
+ A18510271B9ADE4800744AEB /* libWebKitTestRunner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWebKitTestRunner.a; sourceTree = BUILT_PRODUCTS_DIR; };
+ A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTestRunner.xcconfig; sourceTree = "<group>"; };
+ A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTestRunnerApp.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> BC14E4D8120E02D000826C0C /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
</span><span class="cx"> BC14E4D9120E02D000826C0C /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GCController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC14E4E1120E032000826C0C /* GCController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GCController.idl; sourceTree = "<group>"; };
</span><span class="lines">@@ -243,7 +251,7 @@
</span><span class="cx"> BC25186311D15D54002EBC01 /* InjectedBundle-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "InjectedBundle-Info.plist"; sourceTree = "<group>"; };
</span><span class="cx"> BC25197111D15E61002EBC01 /* InjectedBundle.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = InjectedBundle.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BC251A1711D16774002EBC01 /* WebKitTestRunnerPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitTestRunnerPrefix.h; sourceTree = "<group>"; };
</span><del>- BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitTestRunner.xcconfig; sourceTree = "<group>"; };
</del><ins>+ BC251A1811D16795002EBC01 /* WebKitTestRunnerLibrary.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WebKitTestRunnerLibrary.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> BC7933FF118F7C84005EA8E2 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC793426118F7D3C005EA8E2 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BC793427118F7DAF005EA8E2 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -295,10 +303,6 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 2EE52CE51890A9A80010ED21 /* CoreGraphics.framework in Frameworks */,
- 2EE52CE71890A9A80010ED21 /* UIKit.framework in Frameworks */,
- E1AC69F21AFB3B5B00F6D567 /* WebKit.framework in Frameworks */,
- 2EE52CE31890A9A80010ED21 /* Foundation.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -306,11 +310,16 @@
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- BCDA2B9A1191051F00C3BC47 /* JavaScriptCore.framework in Frameworks */,
- 0F5169CB1445222D00E0A9D7 /* WebKit.framework in Frameworks */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A18510241B9ADE4800744AEB /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> BC25186011D15D54002EBC01 /* Frameworks */ = {
</span><span class="cx"> isa = PBXFrameworksBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -411,6 +420,8 @@
</span><span class="cx"> 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */,
</span><span class="cx"> BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */,
</span><span class="cx"> 2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */,
</span><ins>+ A18510181B9ADE0B00744AEB /* All */,
+ A18510271B9ADE4800744AEB /* libWebKitTestRunner.a */,
</ins><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -580,7 +591,9 @@
</span><span class="cx"> 0F2109C7189C650D00F879A3 /* BaseTarget.xcconfig */,
</span><span class="cx"> BC793427118F7DAF005EA8E2 /* DebugRelease.xcconfig */,
</span><span class="cx"> BC25197111D15E61002EBC01 /* InjectedBundle.xcconfig */,
</span><del>- BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */,
</del><ins>+ A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */,
+ A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */,
+ BC251A1811D16795002EBC01 /* WebKitTestRunnerLibrary.xcconfig */,
</ins><span class="cx"> );
</span><span class="cx"> path = Configurations;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -646,6 +659,16 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXGroup section */
</span><span class="cx">
</span><ins>+/* Begin PBXHeadersBuildPhase section */
+ A18510251B9ADE4800744AEB /* Headers */ = {
+ isa = PBXHeadersBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXHeadersBuildPhase section */
+
</ins><span class="cx"> /* Begin PBXNativeTarget section */
</span><span class="cx"> 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="lines">@@ -658,7 +681,7 @@
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- 2E63ED891891AD47002A7AFC /* PBXTargetDependency */,
</del><ins>+ A18510361B9ADE6D00744AEB /* PBXTargetDependency */,
</ins><span class="cx"> );
</span><span class="cx"> name = WebKitTestRunnerApp;
</span><span class="cx"> productName = WebKitTestRunnerApp;
</span><span class="lines">@@ -675,7 +698,7 @@
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- BC25194211D15D94002EBC01 /* PBXTargetDependency */,
</del><ins>+ A18510341B9ADE6200744AEB /* PBXTargetDependency */,
</ins><span class="cx"> );
</span><span class="cx"> name = WebKitTestRunner;
</span><span class="cx"> productInstallPath = "$(HOME)/bin";
</span><span class="lines">@@ -683,6 +706,41 @@
</span><span class="cx"> productReference = 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */;
</span><span class="cx"> productType = "com.apple.product-type.tool";
</span><span class="cx"> };
</span><ins>+ A18510171B9ADE0B00744AEB /* All */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A185101E1B9ADE0B00744AEB /* Build configuration list for PBXNativeTarget "All" */;
+ buildPhases = (
+ A18510161B9ADE0B00744AEB /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ A18510221B9ADE1900744AEB /* PBXTargetDependency */,
+ A18510201B9ADE1400744AEB /* PBXTargetDependency */,
+ );
+ name = All;
+ productName = All;
+ productReference = A18510181B9ADE0B00744AEB /* All */;
+ productType = "com.apple.product-type.in-app-purchase-content";
+ };
+ A18510261B9ADE4800744AEB /* WebKitTestRunner (Library) */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = A185102D1B9ADE4800744AEB /* Build configuration list for PBXNativeTarget "WebKitTestRunner (Library)" */;
+ buildPhases = (
+ A18510231B9ADE4800744AEB /* Sources */,
+ A18510241B9ADE4800744AEB /* Frameworks */,
+ A18510251B9ADE4800744AEB /* Headers */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ A18510321B9ADE5B00744AEB /* PBXTargetDependency */,
+ );
+ name = "WebKitTestRunner (Library)";
+ productName = WebKitTestRunnerLibrary;
+ productReference = A18510271B9ADE4800744AEB /* libWebKitTestRunner.a */;
+ productType = "com.apple.product-type.library.static";
+ };
</ins><span class="cx"> BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = BC25186611D15D55002EBC01 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerInjectedBundle" */;
</span><span class="lines">@@ -708,6 +766,14 @@
</span><span class="cx"> isa = PBXProject;
</span><span class="cx"> attributes = {
</span><span class="cx"> LastSwiftUpdateCheck = 0700;
</span><ins>+ TargetAttributes = {
+ A18510171B9ADE0B00744AEB = {
+ CreatedOnToolsVersion = 7.0;
+ };
+ A18510261B9ADE4800744AEB = {
+ CreatedOnToolsVersion = 7.0;
+ };
+ };
</ins><span class="cx"> };
</span><span class="cx"> buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "WebKitTestRunner" */;
</span><span class="cx"> compatibilityVersion = "Xcode 3.1";
</span><span class="lines">@@ -724,10 +790,12 @@
</span><span class="cx"> projectDirPath = "";
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><ins>+ A18510171B9ADE0B00744AEB /* All */,
</ins><span class="cx"> 8DD76F960486AA7600D96B5E /* WebKitTestRunner */,
</span><ins>+ 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */,
</ins><span class="cx"> BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */,
</span><span class="cx"> BC952D7711F3BF5D003398B4 /* Derived Sources */,
</span><del>- 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */,
</del><ins>+ A18510261B9ADE4800744AEB /* WebKitTestRunner (Library) */,
</ins><span class="cx"> );
</span><span class="cx"> };
</span><span class="cx"> /* End PBXProject section */
</span><span class="lines">@@ -742,6 +810,13 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A18510161B9ADE0B00744AEB /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> BC25185E11D15D54002EBC01 /* Resources */ = {
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -783,20 +858,9 @@
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 2E63ED951891ADC7002A7AFC /* CyclicRedundancyCheck.cpp in Sources */,
</del><span class="cx"> 2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */,
</span><del>- 2E63ED961891ADC7002A7AFC /* GeolocationProviderMock.cpp in Sources */,
</del><span class="cx"> 2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */,
</span><del>- 2E63ED971891ADC7002A7AFC /* PixelDumpSupport.cpp in Sources */,
- 2E63ED981891ADC7002A7AFC /* TestController.cpp in Sources */,
</del><span class="cx"> 2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */,
</span><del>- 2DCE2CD31B8452F800C7F832 /* TestControllerCocoa.mm in Sources */,
- 0FEB90A81905C537000FDBF3 /* CrashReporterInfo.mm in Sources */,
- 2E63ED991891ADC7002A7AFC /* TestInvocation.cpp in Sources */,
- 2E63EDA51891BD8E002A7AFC /* TestInvocationCG.cpp in Sources */,
- 2E63ED9A1891ADC7002A7AFC /* WebNotificationProvider.cpp in Sources */,
- 2E63ED9B1891ADC7002A7AFC /* WorkQueueManager.cpp in Sources */,
- 2E749BEF1891E939007FC175 /* Options.cpp in Sources */,
</del><span class="cx"> 2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */,
</span><span class="cx"> 2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */,
</span><span class="cx"> );
</span><span class="lines">@@ -806,28 +870,35 @@
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="cx"> files = (
</span><del>- 5322FB4313FDA0CD0041ABCC /* CyclicRedundancyCheck.cpp in Sources */,
</del><span class="cx"> E1C642C317CBCC7300D66A3C /* PoseAsClass.mm in Sources */,
</span><span class="cx"> E132AA3D17CE776F00611DF0 /* WebKitTestRunnerEvent.mm in Sources */,
</span><span class="cx"> 5670B8281386FCA5002EB355 /* EventSenderProxy.mm in Sources */,
</span><del>- 2DCE2CD41B84530A00C7F832 /* TestControllerCocoa.mm in Sources */,
- 26D758E7160BECDD00268472 /* GeolocationProviderMock.cpp in Sources */,
</del><span class="cx"> BC793400118F7C84005EA8E2 /* main.mm in Sources */,
</span><del>- 5322FB4613FDA0EA0041ABCC /* PixelDumpSupport.cpp in Sources */,
</del><span class="cx"> E1C642C617CBCD4C00D66A3C /* WebKitTestRunnerPasteboard.mm in Sources */,
</span><span class="cx"> BC7934E811906846005EA8E2 /* PlatformWebViewMac.mm in Sources */,
</span><del>- BC793431118F7F19005EA8E2 /* TestController.cpp in Sources */,
- 0FEB90A91905C548000FDBF3 /* CrashReporterInfo.mm in Sources */,
</del><span class="cx"> BC8C795C11D2785D004535A1 /* TestControllerMac.mm in Sources */,
</span><del>- BCD7D2F811921278006DB7EE /* TestInvocation.cpp in Sources */,
- BC9192051333E4F8003011DC /* TestInvocationCG.cpp in Sources */,
</del><span class="cx"> E132AA3A17CD5F1000611DF0 /* WebKitTestRunnerDraggingInfo.mm in Sources */,
</span><del>- 3164C8F015D1ADA100EF1FE0 /* WebNotificationProvider.cpp in Sources */,
- 4429FC5F1627089600F66D8B /* WorkQueueManager.cpp in Sources */,
- 841CC00F181185BF0042E9B6 /* Options.cpp in Sources */,
</del><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ A18510231B9ADE4800744AEB /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ A18510441B9AE14A00744AEB /* WorkQueueManager.cpp in Sources */,
+ A185103F1B9AE12900744AEB /* GeolocationProviderMock.cpp in Sources */,
+ A185103C1B9AE0FE00744AEB /* Options.cpp in Sources */,
+ A18510431B9AE14500744AEB /* WebNotificationProvider.cpp in Sources */,
+ A18510411B9AE13800744AEB /* TestController.cpp in Sources */,
+ A18510421B9AE13E00744AEB /* TestInvocation.cpp in Sources */,
+ A18510401B9AE13100744AEB /* PixelDumpSupport.cpp in Sources */,
+ A185103D1B9AE10600744AEB /* TestInvocationCG.cpp in Sources */,
+ A185103A1B9AE0DA00744AEB /* CrashReporterInfo.mm in Sources */,
+ A185103E1B9AE12200744AEB /* CyclicRedundancyCheck.cpp in Sources */,
+ A185103B1B9AE0E200744AEB /* TestControllerCocoa.mm in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> BC25185F11D15D54002EBC01 /* Sources */ = {
</span><span class="cx"> isa = PBXSourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -877,16 +948,31 @@
</span><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><del>- 2E63ED891891AD47002A7AFC /* PBXTargetDependency */ = {
</del><ins>+ A18510201B9ADE1400744AEB /* PBXTargetDependency */ = {
</ins><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */;
- targetProxy = 2E63ED881891AD47002A7AFC /* PBXContainerItemProxy */;
</del><ins>+ target = 8DD76F960486AA7600D96B5E /* WebKitTestRunner */;
+ targetProxy = A185101F1B9ADE1400744AEB /* PBXContainerItemProxy */;
</ins><span class="cx"> };
</span><del>- BC25194211D15D94002EBC01 /* PBXTargetDependency */ = {
</del><ins>+ A18510221B9ADE1900744AEB /* PBXTargetDependency */ = {
</ins><span class="cx"> isa = PBXTargetDependency;
</span><ins>+ target = 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */;
+ targetProxy = A18510211B9ADE1900744AEB /* PBXContainerItemProxy */;
+ };
+ A18510321B9ADE5B00744AEB /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
</ins><span class="cx"> target = BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */;
</span><del>- targetProxy = BC25194111D15D94002EBC01 /* PBXContainerItemProxy */;
</del><ins>+ targetProxy = A18510311B9ADE5B00744AEB /* PBXContainerItemProxy */;
</ins><span class="cx"> };
</span><ins>+ A18510341B9ADE6200744AEB /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A18510261B9ADE4800744AEB /* WebKitTestRunner (Library) */;
+ targetProxy = A18510331B9ADE6200744AEB /* PBXContainerItemProxy */;
+ };
+ A18510361B9ADE6D00744AEB /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = A18510261B9ADE4800744AEB /* WebKitTestRunner (Library) */;
+ targetProxy = A18510351B9ADE6D00744AEB /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> BC952ED711F3C38B003398B4 /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = BC952D7711F3BF5D003398B4 /* Derived Sources */;
</span><span class="lines">@@ -909,14 +995,14 @@
</span><span class="cx"> /* Begin XCBuildConfiguration section */
</span><span class="cx"> 1DEB927508733DD40010E9CD /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="cx"> 1DEB927608733DD40010E9CD /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="lines">@@ -939,7 +1025,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2EE52D091890A9A90010ED21 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
</span><span class="cx"> ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
</span><span class="lines">@@ -954,7 +1040,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2EE52D0A1890A9A90010ED21 /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
</span><span class="cx"> ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
</span><span class="lines">@@ -967,7 +1053,7 @@
</span><span class="cx"> };
</span><span class="cx"> 2EE52D0B1890A9A90010ED21 /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
</span><span class="cx"> ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
</span><span class="lines">@@ -978,6 +1064,48 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><ins>+ A185101B1B9ADE0B00744AEB /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = All;
+ };
+ name = Debug;
+ };
+ A185101C1B9ADE0B00744AEB /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = All;
+ };
+ name = Release;
+ };
+ A185101D1B9ADE0B00744AEB /* Production */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ PRODUCT_NAME = All;
+ };
+ name = Production;
+ };
+ A185102E1B9ADE4800744AEB /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunnerLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ A185102F1B9ADE4800744AEB /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunnerLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ A18510301B9ADE4800744AEB /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunnerLibrary.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
</ins><span class="cx"> BC25186411D15D55002EBC01 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> baseConfigurationReference = BC25197111D15E61002EBC01 /* InjectedBundle.xcconfig */;
</span><span class="lines">@@ -1001,7 +1129,7 @@
</span><span class="cx"> };
</span><span class="cx"> BC646D6E136A3A8700B35DED /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BC251A1811D16795002EBC01 /* WebKitTestRunner.xcconfig */;
</del><ins>+ baseConfigurationReference = A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="lines">@@ -1067,6 +1195,26 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><ins>+ A185101E1B9ADE0B00744AEB /* Build configuration list for PBXNativeTarget "All" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A185101B1B9ADE0B00744AEB /* Debug */,
+ A185101C1B9ADE0B00744AEB /* Release */,
+ A185101D1B9ADE0B00744AEB /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
+ A185102D1B9ADE4800744AEB /* Build configuration list for PBXNativeTarget "WebKitTestRunner (Library)" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ A185102E1B9ADE4800744AEB /* Debug */,
+ A185102F1B9ADE4800744AEB /* Release */,
+ A18510301B9ADE4800744AEB /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><span class="cx"> BC25186611D15D55002EBC01 /* Build configuration list for PBXNativeTarget "WebKitTestRunnerInjectedBundle" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span></span></pre>
</div>
</div>
</body>
</html>