Title: [204640] trunk/Tools
- Revision
- 204640
- Author
- [email protected]
- Date
- 2016-08-19 11:24:50 -0700 (Fri, 19 Aug 2016)
Log Message
Another attempt to fix the iOS 9.3 build
Define WK_EMPTY_, WK_NOT_, and WK_NOT_YES.
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204639 => 204640)
--- trunk/Tools/ChangeLog 2016-08-19 18:24:44 UTC (rev 204639)
+++ trunk/Tools/ChangeLog 2016-08-19 18:24:50 UTC (rev 204640)
@@ -1,3 +1,12 @@
+2016-08-19 Daniel Bates <[email protected]>
+
+ Another attempt to fix the iOS 9.3 build
+
+ Define WK_EMPTY_, WK_NOT_, and WK_NOT_YES.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+
2016-08-19 Lucas Forschler <[email protected]>
Remove Yosemite Leaks bot from config.json
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (204639 => 204640)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-08-19 18:24:44 UTC (rev 204639)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-08-19 18:24:50 UTC (rev 204640)
@@ -28,7 +28,11 @@
USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
-WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (204639 => 204640)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-08-19 18:24:44 UTC (rev 204639)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-08-19 18:24:50 UTC (rev 204640)
@@ -72,7 +72,11 @@
WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
