Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (173672 => 173673)
--- trunk/Source/WebKit/mac/ChangeLog 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-16 22:29:44 UTC (rev 173673)
@@ -1,3 +1,12 @@
+2014-09-16 Daniel Bates <[email protected]>
+
+ [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
+ https://bugs.webkit.org/show_bug.cgi?id=136862
+
+ Reviewed by David Kilzer.
+
+ * Configurations/DebugRelease.xcconfig:
+
2014-09-16 Enrica Casucci <[email protected]>
Remove PLATFORM(IOS) from WebCore/editing (Part 3).
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (173672 => 173673)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-09-16 22:29:44 UTC (rev 173673)
@@ -39,8 +39,8 @@
DEBUG_INFORMATION_FORMAT = dwarf;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
Modified: trunk/Source/WebKit2/ChangeLog (173672 => 173673)
--- trunk/Source/WebKit2/ChangeLog 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-16 22:29:44 UTC (rev 173673)
@@ -1,3 +1,12 @@
+2014-09-16 Daniel Bates <[email protected]>
+
+ [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
+ https://bugs.webkit.org/show_bug.cgi?id=136862
+
+ Reviewed by David Kilzer.
+
+ * Configurations/DebugRelease.xcconfig:
+
2014-09-16 Enrica Casucci <[email protected]>
Remove PLATFORM(IOS) from WebCore/editing (Part 3).
Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (173672 => 173673)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-09-16 22:29:44 UTC (rev 173673)
@@ -36,8 +36,8 @@
DEBUG_INFORMATION_FORMAT = dwarf;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
Modified: trunk/Tools/ChangeLog (173672 => 173673)
--- trunk/Tools/ChangeLog 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Tools/ChangeLog 2014-09-16 22:29:44 UTC (rev 173673)
@@ -1,3 +1,15 @@
+2014-09-16 Daniel Bates <[email protected]>
+
+ [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
+ https://bugs.webkit.org/show_bug.cgi?id=136862
+
+ Reviewed by David Kilzer.
+
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Remove hardcoded iOS 8.0
+ IPHONEOS_DEPLOYMENT_TARGET to ensure we link against the latest version of WebKitSystemInterface.
+
2014-09-12 Ryosuke Niwa <[email protected]>
Mac queue slaves should reboot every so often
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (173672 => 173673)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2014-09-16 22:29:44 UTC (rev 173673)
@@ -37,8 +37,8 @@
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (173672 => 173673)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2014-09-16 22:29:44 UTC (rev 173673)
@@ -36,8 +36,8 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterface;
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (173672 => 173673)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2014-09-16 22:18:23 UTC (rev 173672)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2014-09-16 22:29:44 UTC (rev 173673)
@@ -949,7 +949,6 @@
GCC_DYNAMIC_NO_PIC = NO;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
@@ -963,7 +962,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
@@ -977,7 +975,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
PRODUCT_NAME = "$(TARGET_NAME)";
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
