Update macOS version macros
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=213484

Reviewed by Alexey Proskuryakov.

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/DebugRelease.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:

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:
* 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@263364 268f45cc-cd09-0410-ab3c-d52691b4dbfc

65 files changed:
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/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/DebugRelease.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 dd40070..1804783 100644 (file)
@@ -1,3 +1,15 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-19  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Check Gigacage usage before launching VM
index 01066b0..aa23ed5 100644 (file)
@@ -102,12 +102,13 @@ WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-unini
 
 HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(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_VERSION_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_10_17 = 101700;
 
 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 ed72af5..ce55cf5 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 277cb04..1fb1cc4 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 47e81d2..fc1d1d5 100644 (file)
@@ -1,5 +1,17 @@
 2020-06-22  Tim Horton  <timothy_horton@apple.com>
 
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
         WebGL cannot create a context if there is no GPU on the PCIe bus
         https://bugs.webkit.org/show_bug.cgi?id=213479
 
index 0704840..3f1ff9f 100644 (file)
@@ -68,12 +68,13 @@ WARNING_CFLAGS = -Wglobal-constructors -Wno-inconsistent-missing-override;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-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_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_10_17 = 101700;
 
 NORMAL_WEBCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
index 759dbde..60edf31 100644 (file)
@@ -5,19 +5,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 9a77c58..a91da47 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index 488134d..2c984bb 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 737bf70..a30df05 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * gtest/xcode/Config/DebugProject.xcconfig:
+        * gtest/xcode/Config/ReleaseProject.xcconfig:
+
 2020-05-14  Daniel Bates  <dabates@apple.com>
 
         Include LocalOverrides.xcconfig in all Tools projects
index 16d417c..f4be7dc 100644 (file)
@@ -22,6 +22,7 @@ MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 // Dead code stripping off
index 64f54df..2acaaa2 100644 (file)
@@ -24,6 +24,8 @@ MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 // No symbols
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO
index 7444c12..591bf2b 100644 (file)
@@ -1,3 +1,15 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-17  Youenn Fablet  <youenn@apple.com>
 
         Improve SCTP cookie generation
index e3d850b..974d2a2 100644 (file)
@@ -69,12 +69,13 @@ ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_YES = $(ENTITLEMENTS_REQUIRED);
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
 VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
 
-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_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_10_17 = 101700;
 
 SDKROOT = macosx.internal;
 
index eef8ebc..1101384 100644 (file)
@@ -6,19 +6,23 @@ VALID_ARCHS[sdk=watch*] = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 277cb04..1fb1cc4 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 6ef1e68..4998ecb 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-22  Geoffrey Garen  <ggaren@apple.com>
 
         Unreviewed, re-landing r262904.
index 6ce7330..21839ab 100644 (file)
@@ -102,12 +102,13 @@ HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/
 SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
 LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
 
-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_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_10_17 = 101700;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
index a881c98..961deea 100644 (file)
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 622c3b5..fdf8298 100644 (file)
@@ -1,3 +1,15 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-22  Clark Wang  <clark_wang@apple.com>
 
         Added getFloatTimeDomainData method to AnalyserNode
index 0fd2e30..00372b3 100644 (file)
@@ -91,12 +91,13 @@ GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -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 -Wno-unknown-warning-option;
 
-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_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_10_17 = 101700;
 
 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 76f9e60..1535a02 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 5bc80c8..93437f8 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 886d629..6687ec9 100644 (file)
@@ -1,3 +1,15 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-19  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [macOS] Move progress bar painting code off of Carbon API
index 8100fba..873742f 100644 (file)
@@ -90,12 +90,13 @@ GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -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 -Wno-unknown-warning-option;
 
-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_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_10_17 = 101700;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
 
index 2523f9b..c07cb7c 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 25720f9..96c87e9 100644 (file)
@@ -39,6 +39,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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;
 
 // The production build always uses the full version with a system version prefix.
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index cac6cb3..b44f6ad 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-18  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: Console: add comments for localized strings in execution context picker
index ea3c5b9..94206cc 100644 (file)
@@ -5,13 +5,16 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 5ceaa45..2c984bb 100644 (file)
@@ -60,6 +60,18 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
 WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -72,6 +84,14 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_ = _MACOS_SINCE_1015;
 WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
@@ -80,12 +100,42 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
+WK_MACOS_1017_ = _MACOS_SINCE_1017;
+WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
+
 // iOS
 
+WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+
 WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
 WK_IOS_BEFORE_12_11 = YES;
 
@@ -98,6 +148,10 @@ WK_IOS_BEFORE_14_11 = YES;
 WK_IOS_BEFORE_14_12 = YES;
 WK_IOS_BEFORE_14_13 = YES;
 
+WK_IOS_11 = $(WK_IOS_11_$(WK_IOS_BEFORE_11));
+WK_IOS_11_ = _IOS_SINCE_11;
+WK_IOS_11_YES = _IOS_BEFORE_11;
+
 WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
 WK_IOS_12_ = _IOS_SINCE_12;
 WK_IOS_12_YES = _IOS_BEFORE_12;
index 7903351..4fadd13 100644 (file)
@@ -1,5 +1,17 @@
 2020-06-22  Tim Horton  <timothy_horton@apple.com>
 
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
         sysctl() fails due to sandbox violation
         https://bugs.webkit.org/show_bug.cgi?id=213482
 
index d66b24d..59bc1e9 100644 (file)
@@ -88,12 +88,13 @@ OTHER_MIGFLAGS = -F$(BUILT_PRODUCTS_DIR);
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla;
 
-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_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_10_17 = 101700;
 
 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 fea5b2c..51a61ec 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 416e6e9..0a8a089 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 494917f..22ec0e1 100644 (file)
@@ -1,3 +1,15 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitTargetConditionals.xcconfig:
+
 2020-06-19  Chris Dumez  <cdumez@apple.com>
 
         Move Prefixed WebAudio interfaces behind their own feature flag
index 32e2874..2d70cd4 100644 (file)
@@ -90,12 +90,13 @@ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla;
 
-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_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_10_17 = 101700;
 
 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 0eb1920..a6144fb 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 5bc80c8..93437f8 100644 (file)
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 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[sdk=iphone*] = 8;
 
index b413d99..46d849b 100644 (file)
@@ -60,11 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -78,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -90,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -98,10 +112,22 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
index 6b00ed8..adc0b89 100644 (file)
@@ -1,3 +1,13 @@
+2020-06-22  Tim Horton  <timothy_horton@apple.com>
+
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-19  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Check Gigacage usage before launching VM
index f8087e6..6828d83 100644 (file)
@@ -96,12 +96,13 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -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;
 
-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_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_10_17 = 101700;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
index a881c98..961deea 100644 (file)
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 8c0e431..3e52608 100644 (file)
@@ -1,5 +1,29 @@
 2020-06-22  Tim Horton  <timothy_horton@apple.com>
 
+        Update macOS version macros
+        https://bugs.webkit.org/show_bug.cgi?id=213484
+
+        Reviewed by Alexey Proskuryakov.
+
+        * 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:
+        * 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-06-22  Tim Horton  <timothy_horton@apple.com>
+
         API Test WeakLinking.WeakImport fails on arm64
         https://bugs.webkit.org/show_bug.cgi?id=213477
 
index 6b6d703..478c4cd 100644 (file)
@@ -67,12 +67,13 @@ GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla;
 
-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_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_10_17 = 101700;
 
 // 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 34610f0..9a906ea 100644 (file)
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 3ed63a6..9b9c680 100644 (file)
@@ -89,12 +89,13 @@ DEBUG_DEFINES_debug = ;
 DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
-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_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_10_17 = 101700;
 
 SDKROOT = macosx.internal;
 
index f6a6f59..d68a05f 100644 (file)
@@ -28,13 +28,16 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 4b5d535..2d895b5 100644 (file)
@@ -67,12 +67,13 @@ DEBUG_DEFINES_debug = ;
 DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
-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_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_10_17 = 101700;
 
 SDKROOT = macosx.internal;
 
index a33d0ab..fecbff0 100644 (file)
@@ -27,13 +27,16 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index aa24af7..a02ba10 100644 (file)
@@ -72,12 +72,13 @@ GCC_NO_COMMON_BLOCKS = YES;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-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_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_10_17 = 101700;
 
 SDKROOT = macosx.internal;
 
index 87e131c..6ac9ad1 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+// 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);
+
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 5e857aa..43bb17b 100644 (file)
@@ -82,12 +82,13 @@ DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-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_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_10_17 = 101700;
 
 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 73fb86b..eec6567 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
-
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+// 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);
+
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
index 45bb2a4..46d849b 100644 (file)
@@ -60,12 +60,17 @@ WK_MACOS_BEFORE_1016_101300 = YES;
 WK_MACOS_BEFORE_1016_101400 = YES;
 WK_MACOS_BEFORE_1016_101500 = YES;
 
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+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_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_ = _MACOS_SINCE_1014;
@@ -79,6 +84,10 @@ WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
 WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
 
+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;
@@ -91,6 +100,10 @@ WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
 WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
 WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
 
+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;
@@ -99,16 +112,30 @@ WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
 WK_MACOS_1016_ = _MACOS_SINCE_1016;
 WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
 
-WK_MACOS_1016_1017 = $(WK_MACOS_1016_1017_$(WK_MACOS_BEFORE_1016));
-WK_MACOS_1016_1017_ = $(WK_MACOS_1017);
+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_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_1017 = $(WK_MACOS_1017_$(WK_MACOS_BEFORE_1017));
 WK_MACOS_1017_ = _MACOS_SINCE_1017;
 WK_MACOS_1017_YES = _MACOS_BEFORE_1017;
 
 // iOS
 
+WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+
 WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
 WK_IOS_BEFORE_12_11 = YES;
 
@@ -121,6 +148,10 @@ WK_IOS_BEFORE_14_11 = YES;
 WK_IOS_BEFORE_14_12 = YES;
 WK_IOS_BEFORE_14_13 = YES;
 
+WK_IOS_11 = $(WK_IOS_11_$(WK_IOS_BEFORE_11));
+WK_IOS_11_ = _IOS_SINCE_11;
+WK_IOS_11_YES = _IOS_BEFORE_11;
+
 WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
 WK_IOS_12_ = _IOS_SINCE_12;
 WK_IOS_12_YES = _IOS_BEFORE_12;
index 0f2eb9c..eef689b 100644 (file)
@@ -55,11 +55,12 @@ GCC_WARN_UNDECLARED_SELECTOR = YES;
 GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
 
-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_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_10_17 = 101700;
 
 SDKROOT = macosx.internal;
index 63d1973..21d7753 100644 (file)
@@ -27,19 +27,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
index 783644e..c13f390 100644 (file)
@@ -77,12 +77,13 @@ DEBUG_DEFINES_debug = ;
 DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
-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_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_10_17 = 101700;
 
 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 e257c45..e4b4d6e 100644 (file)
@@ -28,19 +28,23 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 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;
 
 SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
index 1c1901b..fa29f5e 100644 (file)
@@ -86,12 +86,13 @@ WARNING_CFLAGS = -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-
 
 HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include;
 
-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_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_10_17 = 101700;
 
 SUPPORTED_PLATFORMS = macosx;
 
index 8ef4f7a..a754910 100644 (file)
 
 ONLY_ACTIVE_ARCH = YES;
 
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
-WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
-WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
-WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
-WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
-WK_MAC_OS_X_VERSION_YES = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
+// 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);
 
 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_101700 = 10.17;
 
 GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;