- Revision
- 161908
- Author
- [email protected]
- Date
- 2014-01-13 14:29:01 -0800 (Mon, 13 Jan 2014)
Log Message
[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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (161907 => 161908)
--- 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)
@@ -1,5 +1,13 @@
2014-01-13 Daniel Bates <[email protected]>
+ [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 <[email protected]>
+
[iOS] Fix up WebKit build phases
Add iOS-specific logic to build phrases "Generate 64-bit Export File" and "Migrate Headers".
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (161907 => 161908)
--- 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)
@@ -2019,7 +2019,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- 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";
+ 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";
};
3713F018142905B70036387F /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
@@ -2095,7 +2095,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- 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";
+ 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";
};
939811300824BF01008DF038 /* Make Frameworks Symbolic Link */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/Source/WebKit/mac/ChangeLog (161907 => 161908)
--- 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)
@@ -1,3 +1,20 @@
+2014-01-13 Daniel Bates <[email protected]>
+
+ [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.
+
2014-01-13 Simon Fraser <[email protected]>
Include WAKAppKitStubs.h to get NSSelectionAffinity.
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (161907 => 161908)
--- 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)
@@ -72,7 +72,6 @@
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
-SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
Modified: trunk/Source/WebKit/mac/Configurations/WebKit.xcconfig (161907 => 161908)
--- 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)
@@ -25,9 +25,9 @@
#include "Version.xcconfig"
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-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;
+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;
EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-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;
+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;
EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
EXPORTED_SYMBOLS_FILE_ = mac/WebKit.exp;
Modified: trunk/Source/WebKit/mac/WebView/WebDocument.h (161907 => 161908)
--- 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)
@@ -32,6 +32,7 @@
#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
+#import <WebKit/WAKView.h>
#endif
@class NSError;
Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (161907 => 161908)
--- 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)
@@ -32,6 +32,7 @@
#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
+#import <WebKit/WAKView.h>
#endif
@class WebDataSource;
Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (161907 => 161908)
--- 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)
@@ -34,6 +34,7 @@
#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
+#import <WebKit/WAKView.h>
#endif
/*!
Modified: trunk/Source/WebKit/mac/WebView/WebView.h (161907 => 161908)
--- 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)
@@ -32,6 +32,7 @@
#import <AppKit/AppKit.h>
#else
#import <WebKit/WAKAppKitStubs.h>
+#import <WebKit/WAKView.h>
#if !defined(IBAction)
#define IBAction void
#endif
