[webkit-changes] [264746] trunk

[conrad_shultz]

Title: [264746] trunk

Revision

264746

Author

conrad_shu...@apple.com

Date

2020-07-22 21:49:02 -0700 (Wed, 22 Jul 2020)

Log Message

Update macOS Version macros
https://bugs.webkit.org/show_bug.cgi?id=214653

Reviewed by Tim Horton.

PerformanceTests:

* MediaTime/Configurations/Base.xcconfig:
* MediaTime/Configurations/DebugRelease.xcconfig:

Source/bmalloc:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:

Source/_javascript_Core:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/ThirdParty:

* gtest/xcode/Config/DebugProject.xcconfig:
* gtest/xcode/Config/ReleaseProject.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WebCore:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WebCore/PAL:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WebInspectorUI:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WebKit:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebKitTargetConditionals.xcconfig:

Source/WTF:

* Configurations/Base.xcconfig:
* Configurations/DebugRelease.xcconfig:
* wtf/PlatformHave.h:

Tools:

* ContentExtensionTester/Configurations/Base.xcconfig:
* ContentExtensionTester/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* ImageDiff/cg/Configurations/Base.xcconfig:
* ImageDiff/cg/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig:
* WebEditingTester/Configurations/Base.xcconfig:
* WebEditingTester/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* lldb/lldbWebKitTester/Configurations/Base.xcconfig:
* lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:

Modified Paths

• trunk/PerformanceTests/ChangeLog
• trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig
• trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig
• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/Configurations/Base.xcconfig
• trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig
• trunk/Source/_javascript_Core/Configurations/Version.xcconfig
• trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/ThirdParty/ANGLE/ChangeLog
• trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
• trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
• trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
• trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/ThirdParty/ChangeLog
• trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
• trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
• trunk/Source/ThirdParty/libwebrtc/ChangeLog
• trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
• trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
• trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
• trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/WTF/ChangeLog
• trunk/Source/WTF/Configurations/Base.xcconfig
• trunk/Source/WTF/Configurations/DebugRelease.xcconfig
• trunk/Source/WTF/wtf/PlatformHave.h
• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/Configurations/Base.xcconfig
• trunk/Source/WebCore/Configurations/DebugRelease.xcconfig
• trunk/Source/WebCore/Configurations/Version.xcconfig
• trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/WebCore/PAL/ChangeLog
• trunk/Source/WebCore/PAL/Configurations/Base.xcconfig
• trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
• trunk/Source/WebCore/PAL/Configurations/Version.xcconfig
• trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/WebInspectorUI/ChangeLog
• trunk/Source/WebInspectorUI/Configurations/Base.xcconfig
• trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
• trunk/Source/WebInspectorUI/Configurations/Version.xcconfig
• trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/WebKit/ChangeLog
• trunk/Source/WebKit/Configurations/Base.xcconfig
• trunk/Source/WebKit/Configurations/DebugRelease.xcconfig
• trunk/Source/WebKit/Configurations/Version.xcconfig
• trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/WebKitLegacy/mac/ChangeLog
• trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
• trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
• trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
• trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Source/bmalloc/ChangeLog
• trunk/Source/bmalloc/Configurations/Base.xcconfig
• trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig
• trunk/Tools/ChangeLog
• trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig
• trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig
• trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
• trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
• trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig
• trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
• trunk/Tools/MiniBrowser/Configurations/Base.xcconfig
• trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
• trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig
• trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
• trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
• trunk/Tools/WebEditingTester/Configurations/Base.xcconfig
• trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
• trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
• trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
• trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
• trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

Diff

Modified: trunk/PerformanceTests/ChangeLog (264745 => 264746)

--- trunk/PerformanceTests/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/PerformanceTests/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * MediaTime/Configurations/Base.xcconfig:
+        * MediaTime/Configurations/DebugRelease.xcconfig:
+
 2020-07-06  Philippe Normand  <pnorm...@igalia.com>
 
         MallocBench: Remove unused private field

Modified: trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/PerformanceTests/MediaTime/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -85,12 +85,13 @@
 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 -Wvla;
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600;
-TARGET_MAC_OS_X_VERISON_MAJOR_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 

Modified: trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -33,7 +33,8 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/_javascript_Core/ChangeLog (264745 => 264746)

--- trunk/Source/_javascript_Core/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/_javascript_Core/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-22  Geoffrey Garen  <gga...@apple.com>
 
         WTF::Function adoption should be explicit instead of implicit

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -108,7 +108,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (264745 => 264746)

--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-17  Kenneth Russell  <k...@chromium.org>
 
         [WebGL2] Fix validation of pixel unpack parameters

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -75,7 +75,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -5,16 +5,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -22,7 +13,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/ThirdParty/ChangeLog (264745 => 264746)

--- trunk/Source/ThirdParty/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * gtest/xcode/Config/DebugProject.xcconfig:
+        * gtest/xcode/Config/ReleaseProject.xcconfig:
+
 2020-06-30  Andy Estes  <aes...@apple.com>
 
         [Xcode] Enable the "My Mac (Mac Catalyst)" destination in WebKit Xcode projects

Modified: trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -23,7 +23,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 // Dead code stripping off
 DEAD_CODE_STRIPPING = NO

Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -25,7 +25,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 // No symbols
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (264745 => 264746)

--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-21  Jer Noble  <jer.no...@apple.com>
 
         Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -75,7 +75,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -6,16 +6,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -23,7 +14,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/WTF/ChangeLog (264745 => 264746)

--- trunk/Source/WTF/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WTF/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,14 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * wtf/PlatformHave.h:
+
 2020-07-22  Keith Miller  <keith_mil...@apple.com>
 
         iOS simulator does not support WebAssembly

Modified: trunk/Source/WTF/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WTF/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WTF/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -108,7 +108,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 SUPPORTS_MACCATALYST = YES;

Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -27,16 +27,7 @@
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -44,7 +35,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/WTF/wtf/PlatformHave.h (264745 => 264746)

--- trunk/Source/WTF/wtf/PlatformHave.h	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WTF/wtf/PlatformHave.h	2020-07-23 04:49:02 UTC (rev 264746)
@@ -578,7 +578,7 @@
 #define HAVE_GCEXTENDEDGAMEPAD_HOME_BUTTON 1
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101700)
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000)
 #define HAVE_GCCONTROLLER_HID_DEVICE_CHECK 1
 #endif
 

Modified: trunk/Source/WebCore/ChangeLog (264745 => 264746)

--- trunk/Source/WebCore/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-22  Jer Noble  <jer.no...@apple.com>
 
         [Cocoa|WebM] Decode error when seeking

Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -98,7 +98,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/WebCore/PAL/ChangeLog (264745 => 264746)

--- trunk/Source/WebCore/PAL/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/PAL/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-22  Chris Dumez  <cdu...@apple.com>
 
         Unreviewed attempt to fix internal build with very recent SDKs.

Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -96,7 +96,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
 

Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -40,7 +40,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

Modified: trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/WebInspectorUI/ChangeLog (264745 => 264746)

--- trunk/Source/WebInspectorUI/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebInspectorUI/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-22  Brian Burg  <bb...@apple.com>
 
         Web Inspector: Sources tab empty, sidebar nonfunctional

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -72,11 +72,13 @@
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 SUPPORTS_MACCATALYST = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_16 = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
+TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 

Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -5,16 +5,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -21,6 +12,8 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
+MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 ENGINEERING_BUILD = 1;
 

Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -13,7 +13,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 
 BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
 SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);

Modified: trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/WebKit/ChangeLog (264745 => 264746)

--- trunk/Source/WebKit/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKit/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-22  Fujii Hironori  <hironori.fu...@sony.com>
 
         [WinCairo][32bit] ConnectionWin.cpp(327): error C2664: 'BOOL RegisterWaitForSingleObject(...)': cannot convert argument 3 from 'void (__cdecl *)(...)' to 'WAITORTIMERCALLBACK'

Modified: trunk/Source/WebKit/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WebKit/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKit/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -94,7 +94,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/WebKit/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (264745 => 264746)

--- trunk/Source/WebKitLegacy/mac/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-07-19  Darin Adler  <da...@apple.com>
 
         Remove live ranges from Editor.h and EditorClient.h

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -96,7 +96,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (264745 => 264746)

--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -39,7 +39,7 @@
 SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 SYSTEM_VERSION_PREFIX_macosx_101600 = 16;
 SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
-SYSTEM_VERSION_PREFIX_macosx_101700 = 17;
+SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 
 // The production build always uses the full version with a system version prefix.

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Source/bmalloc/ChangeLog (264745 => 264746)

--- trunk/Source/bmalloc/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/bmalloc/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2020-07-03  Sam Weinig  <wei...@apple.com>
 
         Add "-Wliteral-conversion" warning to Xcode based builds and fix the issues it finds

Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Source/bmalloc/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -102,7 +102,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 SUPPORTS_MACCATALYST = YES;

Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -27,16 +27,7 @@
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -44,7 +35,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Tools/ChangeLog (264745 => 264746)

--- trunk/Tools/ChangeLog	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/ChangeLog	2020-07-23 04:49:02 UTC (rev 264746)
@@ -1,3 +1,28 @@
+2020-07-22  Conrad Shultz  <conrad_shu...@apple.com>
+
+        Update macOS Version macros
+        https://bugs.webkit.org/show_bug.cgi?id=214653
+
+        Reviewed by Tim Horton.
+
+        * ContentExtensionTester/Configurations/Base.xcconfig:
+        * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * ImageDiff/cg/Configurations/Base.xcconfig:
+        * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/Base.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig:
+        * WebEditingTester/Configurations/Base.xcconfig:
+        * WebEditingTester/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+        * lldb/lldbWebKitTester/Configurations/Base.xcconfig:
+        * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
+
 2020-07-22  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Article headlines are split across multiple lines after translating tagesschau.de

Modified: trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -73,7 +73,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 // 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 (264745 => 264746)

--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -25,16 +25,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -42,7 +33,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -95,7 +95,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -44,7 +35,8 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(USE_INTERNAL_SDK));
 CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);

Modified: trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -75,7 +75,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 

Modified: trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -27,16 +27,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -43,7 +34,8 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
 SDKROOT_ = macosx;

Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -79,7 +79,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 

Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 

Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -89,7 +89,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
 

Modified: trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig (264745 => 264746)

--- trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -65,12 +65,12 @@
 WK_MACOS_BEFORE_1100_101400 = YES;
 WK_MACOS_BEFORE_1100_101500 = YES;
 
-WK_MACOS_BEFORE_1017 = $(WK_MACOS_BEFORE_1017_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1017_101300 = YES;
-WK_MACOS_BEFORE_1017_101400 = YES;
-WK_MACOS_BEFORE_1017_101500 = YES;
-WK_MACOS_BEFORE_1017_101600 = YES;
-WK_MACOS_BEFORE_1017_110000 = YES;
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_101600 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
 
 WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -88,9 +88,9 @@
 WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
 
-WK_MACOS_1014_1017 = $(WK_MACOS_1014_1017_$(WK_MACOS_BEFORE_1014));
-WK_MACOS_1014_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1014_1017_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
 
 WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
@@ -104,9 +104,9 @@
 WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
 WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
 
-WK_MACOS_1015_1017 = $(WK_MACOS_1015_1017_$(WK_MACOS_BEFORE_1015));
-WK_MACOS_1015_1017_ = $(WK_MACOS_1017);
-WK_MACOS_1015_1017_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
 
 WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
@@ -116,21 +116,21 @@
 WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
 WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017 = _MACOS_SINCE_1016;
-WK_MACOS_1016_1017_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
 
 WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
 WK_MACOS_1100_ = _MACOS_SINCE_1100;
 WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1100_1017 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
-WK_MACOS_1100_1017 = _MACOS_SINCE_1100;
-WK_MACOS_1100_1017_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
 
-WK_MACOS_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
-WK_MACOS_1017_ = _MACOS_SINCE_1017;
-WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
 
 // iOS
 

Modified: trunk/Tools/WebEditingTester/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/WebEditingTester/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/WebEditingTester/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -61,6 +61,6 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;

Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -27,16 +27,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -44,7 +35,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 

Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -83,7 +83,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);

Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -28,16 +28,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -45,7 +36,7 @@
 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
 
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
 SDKROOT_ = macosx;

Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (264745 => 264746)

--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -92,7 +92,7 @@
 TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
 TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
 TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = macosx;
 

Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (264745 => 264746)

--- trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:20:47 UTC (rev 264745)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig	2020-07-23 04:49:02 UTC (rev 264746)
@@ -25,16 +25,7 @@
 
 _ONLY_ACTIVE_ARCH_ = YES;
 
-// FIXME: Once rdar://62576618 and rdar://63944514 are resolved, this can return to just being TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR).
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR));
-TARGET_MAC_OS_X_VERSION_MAJOR_101300 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101400 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101500 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_101600 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_10160 = $(TARGET_MAC_OS_X_VERSION_MAJOR_10_16);
-TARGET_MAC_OS_X_VERSION_MAJOR_110000 = $(MAC_OS_X_VERSION_MAJOR);
-TARGET_MAC_OS_X_VERSION_MAJOR_1100 = $(TARGET_MAC_OS_X_VERSION_MAJOR_11_0);
-TARGET_MAC_OS_X_VERSION_MAJOR_101700 = $(MAC_OS_X_VERSION_MAJOR);
+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_101300 = 10.13;
@@ -42,7 +33,7 @@
 MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
 MACOSX_DEPLOYMENT_TARGET_macosx_101600 = 10.16;
 MACOSX_DEPLOYMENT_TARGET_macosx_110000 = 11.0;
-MACOSX_DEPLOYMENT_TARGET_macosx_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes