Title: [161905] trunk/Source/WebKit
- Revision
- 161905
- Author
- [email protected]
- Date
- 2014-01-13 14:02:08 -0800 (Mon, 13 Jan 2014)
Log Message
[iOS] Fix up WebKit build phases
Add iOS-specific logic to build phrases "Generate 64-bit Export File" and "Migrate Headers".
* WebKit.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (161904 => 161905)
--- trunk/Source/WebKit/ChangeLog 2014-01-13 22:01:36 UTC (rev 161904)
+++ trunk/Source/WebKit/ChangeLog 2014-01-13 22:02:08 UTC (rev 161905)
@@ -1,5 +1,13 @@
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".
+
+ * WebKit.xcodeproj/project.pbxproj:
+
+2014-01-13 Daniel Bates <[email protected]>
+
[iOS] Don't link to Mac-only frameworks when building WebKit
Currently the Xcode project always links against various Mac-only frameworks (e.g. Carbon.framework).
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (161904 => 161905)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 22:01:36 UTC (rev 161904)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 22:02:08 UTC (rev 161905)
@@ -1994,15 +1994,17 @@
files = (
);
inputPaths = (
- "$(PROJECT_DIR)/mac/WebKit.exp",
+ "$(SRCROOT)/mac/WebKit.exp",
+ "$(SRCROOT)/ios/WebKit.IOS.exp",
);
name = "Generate 64-bit Export File";
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.LP64.exp",
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.generated.exp",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit\"\n\n# exclude Carbon functions on 64-bit\nsed -e s/^_HIWebViewCreate$// -e s/^_HIWebViewGetWebView$// -e s/^_WebConvertNSImageToCGImageRef$// -e s/^_WebInitForCarbon$// \"${PROJECT_DIR}/mac/WebKit.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\"\n\nif [[ \"${PLATFORM_NAME}\" == \"iphoneos\" || \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]]; then\n cat \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.LP64.exp\" \"${PROJECT_DIR}/ios/WebKit.iOS.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.generated.exp\"\nfi;\n";
};
1C6CB0510AA63EB000D23BFD /* Migrate Headers */ = {
isa = PBXShellScriptBuildPhase;
@@ -2109,7 +2111,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "ln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+ shellScript = "if [[ ${PLATFORM_NAME} == \"iphoneos\" || ${PLATFORM_NAME} == \"iphonesimulator\" ]]; then\n exit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
};
A13EE61D185AE82700556064 /* Postprocess Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
