Update macOS Version macros
authorconrad_shultz@apple.com <conrad_shultz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jul 2020 04:49:02 +0000 (04:49 +0000)
committerconrad_shultz@apple.com <conrad_shultz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 23 Jul 2020 04:49:02 +0000 (04:49 +0000)
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/JavaScriptCore:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@264746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index af388e9..43d4408 100644 (file)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <pnormand@igalia.com>
 
         MallocBench: Remove unused private field
index 101156a..02699a9 100644 (file)
@@ -85,12 +85,13 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -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;
 
index c82458e..50cdace 100644 (file)
@@ -33,7 +33,8 @@ MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 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;
index e26d7cc..5707235 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <ggaren@apple.com>
 
         WTF::Function adoption should be explicit instead of implicit
index f8c4fef..333a213 100644 (file)
@@ -108,7 +108,7 @@ 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_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);
index ce55cf5..c219d4c 100644 (file)
@@ -28,16 +28,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;
@@ -45,7 +36,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index dd6da8f..fe2b03b 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index 763754f..7874506 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <kbr@chromium.org>
 
         [WebGL2] Fix validation of pixel unpack parameters
index d508742..0dba57c 100644 (file)
@@ -75,7 +75,7 @@ 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_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;
index 60edf31..f8985a9 100644 (file)
@@ -5,16 +5,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;
@@ -22,7 +13,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index a0ddb14..6367905 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 2c984bb..e049964 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index b7d0362..0b60007 100644 (file)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <aestes@apple.com>
 
         [Xcode] Enable the "My Mac (Mac Catalyst)" destination in WebKit Xcode projects
index f4be7dc..9e68982 100644 (file)
@@ -23,7 +23,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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
index 2acaaa2..842dec3 100644 (file)
@@ -25,7 +25,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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
index 88400e6..b0555c3 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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.noble@apple.com>
 
         Unreviewed build fix after r264685; copy headers to the correct path during a DEPLOYMENT_LOCATION build.
index 974d2a2..1c691c6 100644 (file)
@@ -75,7 +75,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 
index 487ed51..1efc4b3 100644 (file)
@@ -6,16 +6,7 @@ VALID_ARCHS[sdk=watch*] = $(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;
@@ -23,7 +14,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index dd6da8f..fe2b03b 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index 34e1311..20cd71e 100644 (file)
@@ -1,3 +1,14 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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_miller@apple.com>
 
         iOS simulator does not support WebAssembly
index e20714a..92e2464 100644 (file)
@@ -108,7 +108,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 SUPPORTS_MACCATALYST = YES;
index 961deea..1dd8ee5 100644 (file)
 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_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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index e74b163..d63fb5f 100644 (file)
 #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
 
index 184aa15..35972cb 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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.noble@apple.com>
 
         [Cocoa|WebM] Decode error when seeking
index 0726715..2aff0e1 100644 (file)
@@ -98,7 +98,7 @@ 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_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);
index 1535a02..f383d07 100644 (file)
@@ -28,16 +28,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;
@@ -45,7 +36,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index 5eefebd..267843a 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index 45e3d6c..f2d1981 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <cdumez@apple.com>
 
         Unreviewed attempt to fix internal build with very recent SDKs.
index ce170aa..c5e1a0d 100644 (file)
@@ -96,7 +96,7 @@ 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_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
 
index c07cb7c..a9151ae 100644 (file)
@@ -28,16 +28,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;
@@ -45,7 +36,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index 8d9a0cb..e45e310 100644 (file)
@@ -40,7 +40,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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);
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index d4a928d..f002dd3 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <bburg@apple.com>
 
         Web Inspector: Sources tab empty, sidebar nonfunctional
index bd54a03..e8375c8 100644 (file)
@@ -72,11 +72,13 @@ ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1;
 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;
 
index 94206cc..fd87085 100644 (file)
@@ -5,22 +5,15 @@ 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;
 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;
 
index dd84e9a..09b313b 100644 (file)
@@ -13,7 +13,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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);
index 2c984bb..e049964 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index 999e5d4..846ab1f 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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.Fujii@sony.com>
 
         [WinCairo][32bit] ConnectionWin.cpp(327): error C2664: 'BOOL RegisterWaitForSingleObject(...)': cannot convert argument 3 from 'void (__cdecl *)(...)' to 'WAITORTIMERCALLBACK'
index a28ff8c..fb5ab84 100644 (file)
@@ -94,7 +94,7 @@ 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_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);
index 51a61ec..7791aea 100644 (file)
@@ -28,16 +28,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;
@@ -45,7 +36,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index 09d3575..0689ea0 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index d331c75..d98db46 100644 (file)
@@ -1,3 +1,15 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <darin@apple.com>
 
         Remove live ranges from Editor.h and EditorClient.h
index c71d096..e8f8340 100644 (file)
@@ -96,7 +96,7 @@ 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_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);
index a6144fb..0ba6e50 100644 (file)
@@ -28,16 +28,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;
@@ -45,7 +36,7 @@ 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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index 5eefebd..267843a 100644 (file)
@@ -39,7 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
 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.
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index 4ee2577..74a72e7 100644 (file)
@@ -1,3 +1,13 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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  <weinig@apple.com>
 
         Add "-Wliteral-conversion" warning to Xcode based builds and fix the issues it finds
index 8edc70f..6fb959d 100644 (file)
@@ -102,7 +102,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 SUPPORTS_MACCATALYST = YES;
index 961deea..1dd8ee5 100644 (file)
 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_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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index dcf1082..ec15c49 100644 (file)
@@ -1,3 +1,28 @@
+2020-07-22  Conrad Shultz  <conrad_shultz@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_hsieh@apple.com>
 
         Article headlines are split across multiple lines after translating tagesschau.de
index 478c4cd..9da024e 100644 (file)
@@ -73,7 +73,7 @@ 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_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.
index 9a906ea..a1d9d02 100644 (file)
 
 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_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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;
index a6a91fa..e30ad8d 100644 (file)
@@ -95,7 +95,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 
index d68a05f..eaac890 100644 (file)
@@ -28,23 +28,15 @@ 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[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 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);
index cae7f95..e228273 100644 (file)
@@ -75,7 +75,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 
index fecbff0..15900d0 100644 (file)
@@ -27,23 +27,15 @@ 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[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 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;
index c2e2af3..9a67e8b 100644 (file)
@@ -79,7 +79,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
 
index 6ac9ad1..8ef2771 100644 (file)
@@ -28,16 +28,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_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
@@ -45,7 +36,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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;
 
index 12629b3..0d84c94 100644 (file)
@@ -89,7 +89,7 @@ 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_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);
index eec6567..78d7b25 100644 (file)
@@ -28,16 +28,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_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
@@ -45,7 +36,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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);
 
index 46d849b..f0c62af 100644 (file)
@@ -65,12 +65,12 @@ WK_MACOS_BEFORE_1100_101300 = YES;
 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_1014_1100_$(WK_MACOS_BEFORE_1014));
 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_1015_1100_$(WK_MACOS_BEFORE_1015));
 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 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 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
 
index eef689b..5435fa6 100644 (file)
@@ -61,6 +61,6 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SDKROOT = macosx.internal;
index 21d7753..f0fb6c4 100644 (file)
@@ -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_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
@@ -44,7 +35,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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;
 
index 83b4a42..b708f8e 100644 (file)
@@ -83,7 +83,7 @@ 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_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);
index e4b4d6e..db141a3 100644 (file)
@@ -28,16 +28,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_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
@@ -45,7 +36,7 @@ MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
 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;
index fa29f5e..65e7505 100644 (file)
@@ -92,7 +92,7 @@ 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_10_17 = 101700;
+TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
 
 SUPPORTED_PLATFORMS = macosx;
 
index a754910..a99084e 100644 (file)
 
 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_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_101700 = 10.17;
+MACOSX_DEPLOYMENT_TARGET_macosx_120000 = 12.0;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
 DEBUG_INFORMATION_FORMAT = dwarf;