Title: [204879] trunk/Source/WebCore
- Revision
- 204879
- Author
- [email protected]
- Date
- 2016-08-23 19:19:50 -0700 (Tue, 23 Aug 2016)
Log Message
Create a phony WebKitLegacy framework that the WebCoreTestSupport dylib can find
https://bugs.webkit.org/show_bug.cgi?id=161123
Reviewed by Dan Bernstein.
* Configurations/WebCore.xcconfig:
Use the WebKitLegacy.tbd file from the phony framework.
* Configurations/WebCoreTestSupport.xcconfig:
Look for WebKitLegacy.framework in the phony framework path.
* WebCore.xcodeproj/project.pbxproj:
Add a new phase that creates a phony WebKitLegacy framework.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204878 => 204879)
--- trunk/Source/WebCore/ChangeLog 2016-08-24 02:13:09 UTC (rev 204878)
+++ trunk/Source/WebCore/ChangeLog 2016-08-24 02:19:50 UTC (rev 204879)
@@ -1,3 +1,19 @@
+2016-08-23 Anders Carlsson <[email protected]>
+
+ Create a phony WebKitLegacy framework that the WebCoreTestSupport dylib can find
+ https://bugs.webkit.org/show_bug.cgi?id=161123
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/WebCore.xcconfig:
+ Use the WebKitLegacy.tbd file from the phony framework.
+
+ * Configurations/WebCoreTestSupport.xcconfig:
+ Look for WebKitLegacy.framework in the phony framework path.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Add a new phase that creates a phony WebKitLegacy framework.
+
2016-08-23 Chris Dumez <[email protected]>
Add support for CanvasRenderingContext2D.resetTransform()
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (204878 => 204879)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-24 02:13:09 UTC (rev 204878)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-24 02:19:50 UTC (rev 204879)
@@ -61,7 +61,7 @@
WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);
WK_IOS_BINCOMPAT_LDFLAGS = $(WK_IOS_BINCOMPAT_LDFLAGS_$(WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET:identifier));
-WK_IOS_BINCOMPAT_LDFLAGS_V9_0 = -Wl,-reexport_library,$(SRCROOT)/Configurations/WebKitLegacyStub.iOS.tbd;
+WK_IOS_BINCOMPAT_LDFLAGS_V9_0 = -Wl,-reexport_library,$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy/WebKitLegacy.framework/WebKitLegacy.tbd;
WK_IOS_BINCOMPAT_LDFLAGS_V9_3 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_0);
WK_IOS_BINCOMPAT_LDFLAGS_V10_0 = $(WK_IOS_BINCOMPAT_LDFLAGS_V9_3);
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (204878 => 204879)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2016-08-24 02:13:09 UTC (rev 204878)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2016-08-24 02:19:50 UTC (rev 204879)
@@ -49,6 +49,6 @@
EXPORTED_SYMBOLS_FILE = ;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
-OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility;
-OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility;
+OTHER_LDFLAGS[sdk=iphoneos*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
+OTHER_LDFLAGS[sdk=iphonesimulator*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -F$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy;
SECT_ORDER_FLAGS = ;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204878 => 204879)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-24 02:13:09 UTC (rev 204878)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-24 02:19:50 UTC (rev 204879)
@@ -25,6 +25,7 @@
buildConfigurationList = DD041FC109D9DDDC0010AF2A /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
buildPhases = (
DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */,
+ 1A932ED91D6D2DFC00AB8E6F /* Make Phony WebKitLegacy.framework */,
);
dependencies = (
);
@@ -27142,6 +27143,22 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
+ 1A932ED91D6D2DFC00AB8E6F /* Make Phony WebKitLegacy.framework */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(SRCROOT)/Configurations/WebKitLegacyStub.iOS.tbd",
+ );
+ name = "Make Phony WebKitLegacy.framework";
+ outputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/PhonyWebKitLegacy/WebKitLegacy.framework/WebKitLegacy.tbd",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "ditto \"${SRCROOT}/Configurations/WebKitLegacyStub.iOS.tbd\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/PhonyWebKitLegacy/WebKitLegacy.framework/WebKitLegacy.tbd\"";
+ };
37A1EAA3142699BC0087F425 /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
