Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (198480 => 198481)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,3 +1,16 @@
+2016-03-20 Dan Bernstein <[email protected]>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
2016-03-20 Michael Saboff <[email protected]>
Crash in stress/regexp-matches-array-slow-put.js due to stomping on memory when having bad time
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -88,7 +88,11 @@
HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (198480 => 198481)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,5 +1,18 @@
2016-03-20 Dan Bernstein <[email protected]>
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <[email protected]>
+
Update build settings
Rubber-stamped by Andy Estes.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -45,7 +45,11 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -4,6 +4,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/WTF/ChangeLog (198480 => 198481)
--- trunk/Source/WTF/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,5 +1,18 @@
2016-03-20 Dan Bernstein <[email protected]>
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <[email protected]>
+
Update build settings
Rubber-stamped by Andy Estes.
Modified: trunk/Source/WTF/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/WTF/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -82,7 +82,11 @@
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -26,6 +26,8 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/WebCore/ChangeLog (198480 => 198481)
--- trunk/Source/WebCore/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,3 +1,16 @@
+2016-03-20 Dan Bernstein <[email protected]>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
2016-03-20 Konstantin Tokarev <[email protected]>
Added implementations of AXObjectCache methods for !HAVE(ACCESSIBILITY).
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -79,7 +79,11 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/WebInspectorUI/ChangeLog (198480 => 198481)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,5 +1,18 @@
2016-03-20 Dan Bernstein <[email protected]>
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <[email protected]>
+
Update build settings
Rubber-stamped by Andy Estes.
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -53,7 +53,11 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -4,6 +4,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/WebKit/mac/ChangeLog (198480 => 198481)
--- trunk/Source/WebKit/mac/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,3 +1,16 @@
+2016-03-20 Dan Bernstein <[email protected]>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
2016-03-20 Darin Adler <[email protected]>
Disable Caches in Safari's Develop menu does not disable caches.
Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -73,7 +73,11 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/WebKit2/ChangeLog (198480 => 198481)
--- trunk/Source/WebKit2/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,3 +1,16 @@
+2016-03-20 Dan Bernstein <[email protected]>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
2016-03-20 Darin Adler <[email protected]>
Disable Caches in Safari's Develop menu does not disable caches.
Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -73,7 +73,11 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
// 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/WebKit2/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Source/bmalloc/ChangeLog (198480 => 198481)
--- trunk/Source/bmalloc/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,5 +1,18 @@
2016-03-20 Dan Bernstein <[email protected]>
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <[email protected]>
+
Update build settings
Rubber-stamped by Andy Estes.
Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -80,7 +80,11 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -26,6 +26,8 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Tools/ChangeLog (198480 => 198481)
--- trunk/Tools/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
@@ -1,5 +1,33 @@
2016-03-20 Dan Bernstein <[email protected]>
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR
+ based on the last component of MACOSX_DEPLOYMENT_TARGET.
+ * ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds,
+ preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+ Similarly for these projects:
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * LayoutTestRelay/Configurations/Base.xcconfig:
+ * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/Base.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebEditingTester/Configurations/Base.xcconfig:
+ * WebEditingTester/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
+2016-03-20 Dan Bernstein <[email protected]>
+
Update build settings
Rubber-stamped by Andy Estes.
Modified: trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -65,7 +65,11 @@
GCC_WARN_UNUSED_VARIABLE = YES;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
// 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/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -25,8 +25,9 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -69,7 +69,11 @@
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
Modified: trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -51,7 +51,11 @@
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -25,6 +25,8 @@
ARCHS = $(ARCHS_STANDARD_64_BIT);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -57,7 +57,11 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -72,7 +72,11 @@
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
Modified: trunk/Tools/WebEditingTester/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -54,7 +54,11 @@
WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
CLANG_ENABLE_OBJC_ARC = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SDKROOT = macosx.internal;
Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,8 +27,9 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (198480 => 198481)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -53,7 +53,11 @@
DEBUG_DEFINES_normal = NDEBUG;
DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (198480 => 198481)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
@@ -27,6 +27,8 @@
_ONLY_ACTIVE_ARCH_ = YES;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
