<!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>[179367] trunk/Source/WebKit2</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/179367">179367</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-29 14:14:31 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Frequent kernel panics when running WebKit regression tests
https://bugs.webkit.org/show_bug.cgi?id=141043
Reviewed by Sam Weinig.
Split PluginService.Development into 32-bit and 64-bit variants, to better match
production variant. When building FAT, we'll have the right architecture from
the start now, so no need to re-exec into a different architecture.
* Configurations/PluginService.Development.xcconfig: Removed.
* Configurations/PluginService.32.Development.xcconfig: Copied from Source/WebKit2/Configurations/PluginService.Development.xcconfig.
* Configurations/PluginService.64.Development.xcconfig: Copied from Source/WebKit2/Configurations/PluginService.Development.xcconfig.
Changed to use ONLY_ACTIVE_ARCH instead of CONFIGURATION, so that we build the
right thing even in debug FAT builds.
* Configurations/PluginService.32.xcconfig:
* Configurations/PluginService.64.xcconfig:
While at it, applied the same changes as in Development variants. This means that
FAT builds will now build only the correct architecture for PluginService.64
(it used to build FAT, unnecessarily).
* PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist:
Updated to support multiple product names.
* UIProcess/Launcher/mac/ProcessLauncherMac.mm: (WebKit::serviceName): Launch the
right development service.
* WebKit2.xcodeproj/project.pbxproj: Split the Plugin.Development target into two.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService32xcconfig">trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService64xcconfig">trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessEntryPointmacXPCServicePluginServiceDevelopmentInfoplist">trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService32Developmentxcconfig">trunk/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService64Developmentxcconfig">trunk/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-01-29 Alexey Proskuryakov <ap@apple.com>
+
+ Frequent kernel panics when running WebKit regression tests
+ https://bugs.webkit.org/show_bug.cgi?id=141043
+
+ Reviewed by Sam Weinig.
+
+ Split PluginService.Development into 32-bit and 64-bit variants, to better match
+ production variant. When building FAT, we'll have the right architecture from
+ the start now, so no need to re-exec into a different architecture.
+
+ * Configurations/PluginService.Development.xcconfig: Removed.
+ * Configurations/PluginService.32.Development.xcconfig: Copied from Source/WebKit2/Configurations/PluginService.Development.xcconfig.
+ * Configurations/PluginService.64.Development.xcconfig: Copied from Source/WebKit2/Configurations/PluginService.Development.xcconfig.
+ Changed to use ONLY_ACTIVE_ARCH instead of CONFIGURATION, so that we build the
+ right thing even in debug FAT builds.
+
+ * Configurations/PluginService.32.xcconfig:
+ * Configurations/PluginService.64.xcconfig:
+ While at it, applied the same changes as in Development variants. This means that
+ FAT builds will now build only the correct architecture for PluginService.64
+ (it used to build FAT, unnecessarily).
+
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist:
+ Updated to support multiple product names.
+
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm: (WebKit::serviceName): Launch the
+ right development service.
+
+ * WebKit2.xcodeproj/project.pbxproj: Split the Plugin.Development target into two.
+
</ins><span class="cx"> 2015-01-29 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the build with newer Clang
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService32Developmentxcconfigfromrev179366trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig (from rev 179366, trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig) (0 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.Development.xcconfig 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+// Copyright (C) 2013 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 "BaseXPCService.xcconfig"
+
+WK_XPC_SERVICE_VARIANT = Development;
+
+VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
+VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
+VALID_ARCHS_macosx_NO = i386;
+
+PRODUCT_NAME = com.apple.WebKit.Plugin.32.Development;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
+
+CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
+
+SKIP_INSTALL[sdk=iphone*] = YES;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService32xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -25,23 +25,15 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><del>-VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(CONFIGURATION));
-VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT);
-VALID_ARCHS_macosx_Release = $(VALID_ARCHS_macosx_Debug);
-VALID_ARCHS_macosx_Production = i386;
</del><ins>+VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
+VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
+VALID_ARCHS_macosx_NO = i386;
</ins><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.32;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="cx">
</span><del>-// Since this service is only used in production builds, in debug and release builds
-// we don't link against WebKit2, to avoid linking errors due to not having a WebKit2
-// of the right architecture.
</del><ins>+FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
</ins><span class="cx">
</span><del>-FRAMEWORK_LDFLAGS = -framework Foundation $(FRAMEWORK_LDFLAGS_$(DEBUG_OR_RELEASE));
-FRAMEWORK_LDFLAGS_ = -framework WebKit2;
-FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
-FRAMEWORK_LDFLAGS_YES = ;
-
</del><span class="cx"> OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService64Developmentxcconfigfromrev179366trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig (from rev 179366, trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig) (0 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.Development.xcconfig 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+// Copyright (C) 2013 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 "BaseXPCService.xcconfig"
+
+WK_XPC_SERVICE_VARIANT = Development;
+
+VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
+VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
+VALID_ARCHS_macosx_NO = x86_64;
+
+PRODUCT_NAME = com.apple.WebKit.Plugin.64.Development;
+INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
+
+CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
+
+SKIP_INSTALL[sdk=iphone*] = YES;
+
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService64xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -25,20 +25,15 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><del>-ARCHS[sdk=macosx*] = x86_64;
</del><ins>+VALID_ARCHS[sdk=macosx*] = $(VALID_ARCHS_macosx_$(ONLY_ACTIVE_ARCH));
+VALID_ARCHS_macosx_YES = $(VALID_ARCHS);
+VALID_ARCHS_macosx_NO = x86_64;
</ins><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.64;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="cx">
</span><del>-// Since this service is only used in production builds, in debug and release builds
-// we don't link against WebKit2, to avoid linking errors due to not having a WebKit2
-// of the right architecture.
</del><ins>+FRAMEWORK_LDFLAGS = -framework Foundation -framework WebKit2;
</ins><span class="cx">
</span><del>-FRAMEWORK_LDFLAGS = -framework Foundation $(FRAMEWORK_LDFLAGS_$(DEBUG_OR_RELEASE));
-FRAMEWORK_LDFLAGS_ = -framework WebKit2;
-FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
-FRAMEWORK_LDFLAGS_YES = ;
-
</del><span class="cx"> OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
</span><span class="cx"> OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-// Copyright (C) 2013 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 "BaseXPCService.xcconfig"
-
-WK_XPC_SERVICE_VARIANT = Development;
-
-PRODUCT_NAME = com.apple.WebKit.Plugin.Development;
-INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist;
-
-CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
-
-SKIP_INSTALL[sdk=iphone*] = YES;
-
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
-OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</del></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessEntryPointmacXPCServicePluginServiceDevelopmentInfoplist"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <key>CFBundleExecutable</key>
</span><span class="cx"> <string>${EXECUTABLE_NAME}</string>
</span><span class="cx"> <key>CFBundleIdentifier</key>
</span><del>- <string>com.apple.WebKit.Plugin.Development</string>
</del><ins>+ <string>${PRODUCT_NAME}</string>
</ins><span class="cx"> <key>CFBundleInfoDictionaryVersion</key>
</span><span class="cx"> <string>6.0</string>
</span><span class="cx"> <key>CFBundleName</key>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -177,14 +177,18 @@
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> case ProcessLauncher::PluginProcess:
</span><del>- if (forDevelopment)
- return "com.apple.WebKit.Plugin.Development";
-
</del><span class="cx"> // FIXME: Support plugins that require an executable heap.
</span><del>- if (launchOptions.architecture == CPU_TYPE_X86)
- return "com.apple.WebKit.Plugin.32";
- if (launchOptions.architecture == CPU_TYPE_X86_64)
- return "com.apple.WebKit.Plugin.64";
</del><ins>+ if (forDevelopment) {
+ if (launchOptions.architecture == CPU_TYPE_X86)
+ return "com.apple.WebKit.Plugin.32.Development";
+ if (launchOptions.architecture == CPU_TYPE_X86_64)
+ return "com.apple.WebKit.Plugin.64.Development";
+ } else {
+ if (launchOptions.architecture == CPU_TYPE_X86)
+ return "com.apple.WebKit.Plugin.32";
+ if (launchOptions.architecture == CPU_TYPE_X86_64)
+ return "com.apple.WebKit.Plugin.64";
+ }
</ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (179366 => 179367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-29 22:03:40 UTC (rev 179366)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-29 22:14:31 UTC (rev 179367)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> BC77F95616D0459100F8F78A /* PBXTargetDependency */,
</span><span class="cx"> BC82844616B4FF6600A278FE /* PBXTargetDependency */,
</span><span class="cx"> BC82844816B4FF6F00A278FE /* PBXTargetDependency */,
</span><ins>+ E1B1B19C1A7AD133007B0965 /* PBXTargetDependency */,
</ins><span class="cx"> BC8283D516B4C01F00A278FE /* PBXTargetDependency */,
</span><span class="cx"> BC8283D716B4C02200A278FE /* PBXTargetDependency */,
</span><span class="cx"> );
</span><span class="lines">@@ -1712,6 +1713,8 @@
</span><span class="cx"> E1A9A852169E2025002D7176 /* WebKit.icns in Resources */ = {isa = PBXBuildFile; fileRef = E133FD891423DD7F00FC7BFB /* WebKit.icns */; };
</span><span class="cx"> E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */; };
</span><span class="cx"> E1AEA23014687BDB00804569 /* WKFullKeyboardAccessWatcher.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */; };
</span><ins>+ E1B1B1901A7AC1F5007B0965 /* XPCServiceMain.Development.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839716B480F600A278FE /* XPCServiceMain.Development.mm */; };
+ E1B1B1921A7AC1F5007B0965 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
</ins><span class="cx"> E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B78470163F24690007B692 /* RemoteNetworkingContext.h */; };
</span><span class="cx"> E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */; };
</span><span class="cx"> E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = E1CC1B8E12D7EADF00625838 /* PrintInfo.h */; };
</span><span class="lines">@@ -1985,6 +1988,20 @@
</span><span class="cx"> remoteGlobalIDString = 510031EA1379CACB00C8DFE4;
</span><span class="cx"> remoteInfo = SecItemShim;
</span><span class="cx"> };
</span><ins>+ E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ remoteInfo = WebKit;
+ };
+ E1B1B19B1A7AD133007B0965 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = E1B1B18C1A7AC1F5007B0965;
+ remoteInfo = Plugin.64.Development;
+ };
</ins><span class="cx"> /* End PBXContainerItemProxy section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><span class="lines">@@ -3610,7 +3627,7 @@
</span><span class="cx"> BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</span><del>- BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</del><ins>+ BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.32.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
</ins><span class="cx"> BC8452A51162C80900CAB9B5 /* DrawingArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DrawingArea.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC8452A61162C80900CAB9B5 /* DrawingArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingArea.h; sourceTree = "<group>"; };
</span><span class="cx"> BC84EB1712A7100C0083F2DA /* WebPreferencesMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPreferencesMac.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -3683,7 +3700,7 @@
</span><span class="cx"> BCBD3912125BB1A800D2C29F /* WebPageProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageProxyMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BCBD3913125BB1A800D2C29F /* WebPageProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> BCBECDC016B5CE0D00047A1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
</span><del>- BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.Development.xcconfig; sourceTree = "<group>"; };
</del><ins>+ BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.64.Development.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> BCBECDE516B6416700047A1A /* XPCServiceEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = XPCServiceEntryPoint.mm; sourceTree = "<group>"; };
</span><span class="cx"> BCBECDE616B6416700047A1A /* XPCServiceEntryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCServiceEntryPoint.h; sourceTree = "<group>"; };
</span><span class="cx"> BCC43AB8127B95DC00317F16 /* PlatformPopupMenuData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformPopupMenuData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3901,6 +3918,8 @@
</span><span class="cx"> E1A31734134CEA80007C9A4F /* AttributedString.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AttributedString.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1AEA22D14687BDB00804569 /* WKFullKeyboardAccessWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFullKeyboardAccessWatcher.h; sourceTree = "<group>"; };
</span><span class="cx"> E1AEA22E14687BDB00804569 /* WKFullKeyboardAccessWatcher.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFullKeyboardAccessWatcher.mm; sourceTree = "<group>"; };
</span><ins>+ E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.WebKit.Plugin.64.Development.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+ E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = PluginService.32.Development.xcconfig; sourceTree = "<group>"; };
</ins><span class="cx"> E1B78470163F24690007B692 /* RemoteNetworkingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteNetworkingContext.h; path = NetworkProcess/RemoteNetworkingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> E1B78472163F253E0007B692 /* RemoteNetworkingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteNetworkingContext.mm; sourceTree = "<group>"; };
</span><span class="cx"> E1CC1B8E12D7EADF00625838 /* PrintInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4098,6 +4117,14 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ E1B1B1911A7AC1F5007B0965 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ E1B1B1921A7AC1F5007B0965 /* Foundation.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> /* End PBXFrameworksBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXGroup section */
</span><span class="lines">@@ -4110,7 +4137,8 @@
</span><span class="cx"> BC8283B116B4BF7700A278FE /* com.apple.WebKit.Networking.xpc */,
</span><span class="cx"> BC8283F916B4FDDE00A278FE /* com.apple.WebKit.Plugin.32.xpc */,
</span><span class="cx"> BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */,
</span><del>- BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.Development.xpc */,
</del><ins>+ BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */,
+ E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */,
</ins><span class="cx"> BCAE9DE9160C097400A33217 /* com.apple.WebKit.WebContent.Development.xpc */,
</span><span class="cx"> BC3DE46615A91763008D26FC /* com.apple.WebKit.WebContent.xpc */,
</span><span class="cx"> 51FA1E28180CCADE00C44BE9 /* DatabaseProcess.app */,
</span><span class="lines">@@ -4377,8 +4405,9 @@
</span><span class="cx"> BC122FA3132707F300F7EAC1 /* PluginProcess.xcconfig */,
</span><span class="cx"> A1EDD2DB1884B96400BBFE98 /* PluginProcessShim.xcconfig */,
</span><span class="cx"> BC8283F216B4FC5300A278FE /* PluginService.32.xcconfig */,
</span><ins>+ E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */,
</ins><span class="cx"> BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
</span><del>- BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */,
</del><ins>+ BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */,
</ins><span class="cx"> 5D442A5516D5856700AC3331 /* PluginService.entitlements */,
</span><span class="cx"> A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
</span><span class="cx"> 5183B3931379F85C00E8754E /* Shim.xcconfig */,
</span><span class="lines">@@ -8496,9 +8525,9 @@
</span><span class="cx"> productReference = BC82841F16B4FDF600A278FE /* com.apple.WebKit.Plugin.64.xpc */;
</span><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><del>- BC82843116B4FE1300A278FE /* Plugin.Development */ = {
</del><ins>+ BC82843116B4FE1300A278FE /* Plugin.32.Development */ = {
</ins><span class="cx"> isa = PBXNativeTarget;
</span><del>- buildConfigurationList = BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.Development" */;
</del><ins>+ buildConfigurationList = BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.32.Development" */;
</ins><span class="cx"> buildPhases = (
</span><span class="cx"> BC82842E16B4FE1300A278FE /* Sources */,
</span><span class="cx"> BC82842F16B4FE1300A278FE /* Frameworks */,
</span><span class="lines">@@ -8509,9 +8538,9 @@
</span><span class="cx"> dependencies = (
</span><span class="cx"> 375E0639191EA9AD004E3CAF /* PBXTargetDependency */,
</span><span class="cx"> );
</span><del>- name = Plugin.Development;
</del><ins>+ name = Plugin.32.Development;
</ins><span class="cx"> productName = Plugin.64.Development;
</span><del>- productReference = BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.Development.xpc */;
</del><ins>+ productReference = BC82843216B4FE1300A278FE /* com.apple.WebKit.Plugin.32.Development.xpc */;
</ins><span class="cx"> productType = "com.apple.product-type.bundle";
</span><span class="cx"> };
</span><span class="cx"> BCAE9DE8160C097400A33217 /* WebContent.Development */ = {
</span><span class="lines">@@ -8570,6 +8599,24 @@
</span><span class="cx"> productReference = CDC3830617211799008A2FC3 /* WebProcessShim.dylib */;
</span><span class="cx"> productType = "com.apple.product-type.library.dynamic";
</span><span class="cx"> };
</span><ins>+ E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = E1B1B1941A7AC1F5007B0965 /* Build configuration list for PBXNativeTarget "Plugin.64.Development" */;
+ buildPhases = (
+ E1B1B18F1A7AC1F5007B0965 /* Sources */,
+ E1B1B1911A7AC1F5007B0965 /* Frameworks */,
+ E1B1B1931A7AC1F5007B0965 /* Resources */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */,
+ );
+ name = Plugin.64.Development;
+ productName = Plugin.64.Development;
+ productReference = E1B1B1981A7AC1F5007B0965 /* com.apple.WebKit.Plugin.64.Development.xpc */;
+ productType = "com.apple.product-type.bundle";
+ };
</ins><span class="cx"> /* End PBXNativeTarget section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXProject section */
</span><span class="lines">@@ -8611,7 +8658,8 @@
</span><span class="cx"> BC8283C416B4BFA800A278FE /* Networking.Development */,
</span><span class="cx"> BC8283F816B4FDDE00A278FE /* Plugin.32 */,
</span><span class="cx"> BC82841E16B4FDF600A278FE /* Plugin.64 */,
</span><del>- BC82843116B4FE1300A278FE /* Plugin.Development */,
</del><ins>+ BC82843116B4FE1300A278FE /* Plugin.32.Development */,
+ E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */,
</ins><span class="cx"> 51F7DC3F180CC93600212CA3 /* Databases */,
</span><span class="cx"> 5180C713180CCA3100FDA612 /* Databases.Development */,
</span><span class="cx"> A7AADA1019395CA9003EA1C7 /* WebKit2SandboxProfiles */,
</span><span class="lines">@@ -8733,6 +8781,13 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ E1B1B1931A7AC1F5007B0965 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> /* End PBXResourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXShellScriptBuildPhase section */
</span><span class="lines">@@ -8972,7 +9027,8 @@
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Networking.Development.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.xpc",
</span><del>- "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.Development.xpc",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.32.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Plugin.64.Development.xpc",
</ins><span class="cx"> "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/com.apple.WebKit.Databases.Development.xpc",
</span><span class="cx"> );
</span><span class="lines">@@ -8984,13 +9040,14 @@
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Networking.Development.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.xpc",
</span><del>- "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.Development.xpc",
</del><ins>+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.32.Development.xpc",
+ "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Plugin.64.Development.xpc",
</ins><span class="cx"> "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.xpc",
</span><span class="cx"> "$(BUILT_PRODUCTS_DIR)/${WRAPPER_NAME}/WebKit.framework/XPCServices/com.apple.WebKit.Databases.Development.xpc",
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\&
quot; \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.Development.xpc\"\nfi\n";
</del><ins>+ shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n exit\nfi\n\nif [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/XPCServices\"\nelse\n XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/WebKit.framework/Versions/A/XPCServices\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.WebContent.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Networking.Development.xpc\&q
uot; \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.Development.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.xpc\"\nditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Databases.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Databases.Development.xpc\"\n\nif [[ ${PLATFORM_NAME} == macosx ]]; then\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.32.Development.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.32.Development.xpc\"\n ditto \"${BUILT_PRODUCTS_DIR}/com.apple.WebKit.Plugin.64.Development.xpc\" \"${X
PC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.Development.xpc\"\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -9943,6 +10000,14 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><ins>+ E1B1B18F1A7AC1F5007B0965 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ E1B1B1901A7AC1F5007B0965 /* XPCServiceMain.Development.mm in Sources */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
</ins><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><span class="lines">@@ -10068,7 +10133,7 @@
</span><span class="cx"> };
</span><span class="cx"> BC82844816B4FF6F00A278FE /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><del>- target = BC82843116B4FE1300A278FE /* Plugin.Development */;
</del><ins>+ target = BC82843116B4FE1300A278FE /* Plugin.32.Development */;
</ins><span class="cx"> targetProxy = BC82844716B4FF6F00A278FE /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><span class="cx"> BCA8D46815BCE0D6009DC1F1 /* PBXTargetDependency */ = {
</span><span class="lines">@@ -10106,6 +10171,16 @@
</span><span class="cx"> target = 510031EA1379CACB00C8DFE4 /* SecItemShim */;
</span><span class="cx"> targetProxy = CDC8F4D41725F73F00166F6E /* PBXContainerItemProxy */;
</span><span class="cx"> };
</span><ins>+ E1B1B18D1A7AC1F5007B0965 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = 8DC2EF4F0486A6940098B216 /* WebKit */;
+ targetProxy = E1B1B18E1A7AC1F5007B0965 /* PBXContainerItemProxy */;
+ };
+ E1B1B19C1A7AD133007B0965 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ target = E1B1B18C1A7AC1F5007B0965 /* Plugin.64.Development */;
+ targetProxy = E1B1B19B1A7AD133007B0965 /* PBXContainerItemProxy */;
+ };
</ins><span class="cx"> /* End PBXTargetDependency section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXVariantGroup section */
</span><span class="lines">@@ -10535,21 +10610,21 @@
</span><span class="cx"> };
</span><span class="cx"> BC82843E16B4FE1400A278FE /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */;
</del><ins>+ baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="cx"> BC82843F16B4FE1400A278FE /* Release */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */;
</del><ins>+ baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span><span class="cx"> BC82844016B4FE1400A278FE /* Production */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span><del>- baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.Development.xcconfig */;
</del><ins>+ baseConfigurationReference = E1B1B19A1A7AC287007B0965 /* PluginService.32.Development.xcconfig */;
</ins><span class="cx"> buildSettings = {
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="lines">@@ -10649,6 +10724,27 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><ins>+ E1B1B1951A7AC1F5007B0965 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ E1B1B1961A7AC1F5007B0965 /* Release */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
+ buildSettings = {
+ };
+ name = Release;
+ };
+ E1B1B1971A7AC1F5007B0965 /* Production */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */;
+ buildSettings = {
+ };
+ name = Production;
+ };
</ins><span class="cx"> /* End XCBuildConfiguration section */
</span><span class="cx">
</span><span class="cx"> /* Begin XCConfigurationList section */
</span><span class="lines">@@ -10832,7 +10928,7 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.Development" */ = {
</del><ins>+ BC82843D16B4FE1400A278FE /* Build configuration list for PBXNativeTarget "Plugin.32.Development" */ = {
</ins><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><span class="cx"> BC82843E16B4FE1400A278FE /* Debug */,
</span><span class="lines">@@ -10882,6 +10978,16 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><ins>+ E1B1B1941A7AC1F5007B0965 /* Build configuration list for PBXNativeTarget "Plugin.64.Development" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ E1B1B1951A7AC1F5007B0965 /* Debug */,
+ E1B1B1961A7AC1F5007B0965 /* Release */,
+ E1B1B1971A7AC1F5007B0965 /* Production */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Production;
+ };
</ins><span class="cx"> /* End XCConfigurationList section */
</span><span class="cx"> };
</span><span class="cx"> rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
</span></span></pre>
</div>
</div>
</body>
</html>