<!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>[161908] trunk/Source/WebKit</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/161908">161908</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-13 14:29:01 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] More build fixes for WebKit
Source/WebKit:
Add iOS-specific logic to build phases: "Symlink WebKitPluginHost in to place" and "Migrate Headers".
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* Configurations/Base.xcconfig: Removed extraneous definition of SUPPORTED_PLATFORMS.
* Configurations/WebKit.xcconfig: Exclude more Mac-specific files when building for iOS:
CarbonUtils.m, CarbonWindowAdapter.mm, CarbonWindowContentView.m, CarbonWindowFrame.m,
HIViewAdapter.m, HIWebView.mm, MailQuirksUserScript.js, OutlookQuirksUserScript.js,
PopupMenuMac.mm, SearchPopupMenuMac.mm, WebClipView.mm, WebInspectorClient.mm,
WebNetscapeContainerCheckContextInfo.mm, WebNetscapeContainerCheckPrivate.mm, WebRenderNode.mm,
WebStringTruncator.mm, and WebTextCompletionController.mm. I haven't verified the Mac-specific
nature of each of these files. We may be able to reduce this list upon further investigation.
* WebView/WebDocument.h: Include header <WebKit/WAKView.h> for definition of WAKView.
* WebView/WebFrameView.h: Ditto.
* WebView/WebUIDelegate.h: Ditto.
* WebView/WebView.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitxcconfig">trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDocumenth">trunk/Source/WebKit/mac/WebView/WebDocument.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewh">trunk/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegateh">trunk/Source/WebKit/mac/WebView/WebUIDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewh">trunk/Source/WebKit/mac/WebView/WebView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/ChangeLog 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -1,5 +1,13 @@
</span><span class="cx"> 2014-01-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] More build fixes for WebKit
+
+ Add iOS-specific logic to build phases: "Symlink WebKitPluginHost in to place" and "Migrate Headers".
+
+ * WebKit.xcodeproj/project.pbxproj:
+
+2014-01-13 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> [iOS] Fix up WebKit build phases
</span><span class="cx">
</span><span class="cx"> Add iOS-specific logic to build phrases "Generate 64-bit Export File" and "Migrate Headers".
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -2019,7 +2019,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make -C mac -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
</del><ins>+ shellScript = "mkdir -p \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\nmkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# If we didn't build WebCore, use the production copy of the headers\nif [ ! -d \"${WEBCORE_PRIVATE_HEADERS_DIR}\" ]; then\n export WEBCORE_PRIVATE_HEADERS_DIR=\"`eval 'echo ${WEBCORE_PRIVATE_HEADERS_DIR_'${PLATFORM_NAME}'_Production}'`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make -C mac -f \"MigrateHeaders.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> 3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -2095,7 +2095,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n fi\nfi\n";
</del><ins>+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nif [[ \"${CONFIGURATION}\" != \"Production\" && \"${ACTION}\" == \"build\" ]]; then\n if [[ ! -e \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\" ]]; then\n ln -s /System/Library/Frameworks/WebKit.framework/WebKitPluginHost.app \"${CONFIGURATION_BUILD_DIR}/WebKit.framework/WebKitPluginHost.app\"\n fi\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> 939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-13 Daniel Bates <dabates@apple.com>
+
+ [iOS] More build fixes for WebKit
+
+ * Configurations/Base.xcconfig: Removed extraneous definition of SUPPORTED_PLATFORMS.
+ * Configurations/WebKit.xcconfig: Exclude more Mac-specific files when building for iOS:
+ CarbonUtils.m, CarbonWindowAdapter.mm, CarbonWindowContentView.m, CarbonWindowFrame.m,
+ HIViewAdapter.m, HIWebView.mm, MailQuirksUserScript.js, OutlookQuirksUserScript.js,
+ PopupMenuMac.mm, SearchPopupMenuMac.mm, WebClipView.mm, WebInspectorClient.mm,
+ WebNetscapeContainerCheckContextInfo.mm, WebNetscapeContainerCheckPrivate.mm, WebRenderNode.mm,
+ WebStringTruncator.mm, and WebTextCompletionController.mm. I haven't verified the Mac-specific
+ nature of each of these files. We may be able to reduce this list upon further investigation.
+ * WebView/WebDocument.h: Include header <WebKit/WAKView.h> for definition of WAKView.
+ * WebView/WebFrameView.h: Ditto.
+ * WebView/WebUIDelegate.h: Ditto.
+ * WebView/WebView.h: Ditto.
+
</ins><span class="cx"> 2014-01-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Include WAKAppKitStubs.h to get NSSelectionAffinity.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -72,7 +72,6 @@
</span><span class="cx">
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</span><span class="cx">
</span><del>-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
</del><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff WebDashboardRegion.h WebDynamicScrollBarsView.h WebIconDatabase.h WebIconDatabasePrivate.h WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebPanelAuthenticationHandler.h WebPluginsPrivate.h;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm MailQuirksUserScript.js OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebClipView.mm WebDashboardRegion.h WebDynamicScrollBarsView.h WebIconDatabase.h WebIconDatabasePrivate.h WebInspectorClient.mm WebJavaScriptTextInputPanel.h WebKeyGenerator.h WebNSEventExtras.h WebNSPasteboardExtras.h WebNSWindowExtras.h WebNetscapeContainerCheckContextInfo.mm WebNetscapeContainerCheckPrivate.mm WebPanelAuthenticationHandler.h WebPluginsPrivate.h WebRenderNode.mm WebStringTruncator.mm WebTextCompletionController.mm;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_macosx = MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringDrawing.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</ins><span class="cx">
</span><span class="cx"> EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDocument.h (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDocument.h 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/WebView/WebDocument.h 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class NSError;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WebDataSource;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /*!
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.h (161907 => 161908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:27:18 UTC (rev 161907)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2014-01-13 22:29:01 UTC (rev 161908)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import <AppKit/AppKit.h>
</span><span class="cx"> #else
</span><span class="cx"> #import <WebKit/WAKAppKitStubs.h>
</span><ins>+#import <WebKit/WAKView.h>
</ins><span class="cx"> #if !defined(IBAction)
</span><span class="cx"> #define IBAction void
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>