Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (262541 => 262542)
--- trunk/Source/_javascript_Core/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (262541 => 262542)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-02 Keith Rollin <[email protected]>
Change ANGLE's header postprocessing script to not rely on timestamps
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -5,7 +5,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (262541 => 262542)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-02 Commit Queue <[email protected]>
Unreviewed, reverting r262290.
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -6,7 +6,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WTF/ChangeLog (262541 => 262542)
--- trunk/Source/WTF/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WTF/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -27,7 +27,13 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WebCore/ChangeLog (262541 => 262542)
--- trunk/Source/WebCore/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebCore/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WebCore/PAL/ChangeLog (262541 => 262542)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WebInspectorUI/ChangeLog (262541 => 262542)
--- trunk/Source/WebInspectorUI/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebInspectorUI/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-01 Devin Rousso <[email protected]>
Web Inspector: Graphics: should use the `id` (name) of the animation if it exists
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -5,7 +5,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WebKit/ChangeLog (262541 => 262542)
--- trunk/Source/WebKit/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebKit/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (262541 => 262542)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Source/bmalloc/ChangeLog (262541 => 262542)
--- trunk/Source/bmalloc/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/bmalloc/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,12 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * Configurations/DebugRelease.xcconfig:
+
2020-06-02 Mark Lam <[email protected]>
Change Gigacage::Config to use storage in WebConfig::g_config instead of its own.
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -27,7 +27,13 @@
ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Tools/ChangeLog (262541 => 262542)
--- trunk/Tools/ChangeLog 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/ChangeLog 2020-06-04 16:08:44 UTC (rev 262542)
@@ -1,3 +1,19 @@
+2020-06-04 Tim Horton <[email protected]>
+
+ Work around broken system version macro
+ https://bugs.webkit.org/show_bug.cgi?id=212726
+
+ Reviewed by Dan Bernstein.
+
+ * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebEditingTester/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
+
2020-06-04 Andy Estes <[email protected]>
[watchOS] Re-enable content filtering in the simulator build
Modified: trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -25,7 +25,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -27,7 +27,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -27,7 +27,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -28,7 +28,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (262541 => 262542)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:02:13 UTC (rev 262541)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2020-06-04 16:08:44 UTC (rev 262542)
@@ -25,7 +25,13 @@
_ONLY_ACTIVE_ARCH_ = YES;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
