Update macOS version macros

author timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)

committer timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
author timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
committer timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog

index dd400708f03ac93c0022228feac864fe60264731..18047839f862a1a4b519d4babbe8315d26ccd8b6 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -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
diff --git a/Source/JavaScriptCore/Configurations/Base.xcconfig b/Source/JavaScriptCore/Configurations/Base.xcconfig

index 01066b086725505b914a4cc2bb54e2531f5e7a08..aa23ed56a80193e205f4ecc03fd761c2856ebbe9 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Base.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Base.xcconfig
@@ -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);
diff --git a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

index ed72af5d17b7addb7fbf430ef98e73819b54646f..ce55cf534c196776dabcf23c62cb118cb3394b83 100644 (file)
--- a/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
+++ b/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/JavaScriptCore/Configurations/Version.xcconfig b/Source/JavaScriptCore/Configurations/Version.xcconfig

index 277cb04932ebec28f41d11a722c3b4cfd6df26b6..1fb1cc40d4423fe447d0680703b6c606394a019a 100644 (file)
--- a/Source/JavaScriptCore/Configurations/Version.xcconfig
+++ b/Source/JavaScriptCore/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig b/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog

index 47e81d23217f936d33fcb5c5754c0681e8b37163..fc1d1d57607944c25e384a75f01c7be6a0c82388 100644 (file)
--- a/Source/ThirdParty/ANGLE/ChangeLog
+++ b/Source/ThirdParty/ANGLE/ChangeLog
@@ -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  Tim Horton  <timothy_horton@apple.com>
  
          WebGL cannot create a context if there is no GPU on the PCIe bus
diff --git a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

index 070484066fe0d5c38e3945320366c29f8605e803..3f1ff9fa30821a0ced26bf9677378b3a87a8ab43 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
@@ -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;
diff --git a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

index 759dbde069d1cac2c94ec883511082d288cd0d43..60edf31f374b5e5edd8564642cba8b43652d0122 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig b/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig

index 9a77c58e4d4761ba1df5e094517701b3962b40ad..a91da47c475310a529b620ae903743d2f0f75600 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig b/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig

index 488134ddf820ee21a51bc369b948f2fc875e7c02..2c984bb246a8e0076abbcd2e6361546b2fef540c 100644 (file)
--- a/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/ThirdParty/ChangeLog b/Source/ThirdParty/ChangeLog

index 737bf7049167159b4e303d7570af3a486784104a..a30df053f7657d78e155c93b6b8727e60f547b63 100644 (file)
--- a/Source/ThirdParty/ChangeLog
+++ b/Source/ThirdParty/ChangeLog
@@ -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
diff --git a/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig

index 16d417c503e4aac8bc6b97cc42c7288cf749ef29..f4be7dcda6deba43235a35bac0641694433cb7cb 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig
@@ -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
diff --git a/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig b/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig

index 64f54dffb3f6eed9176ff720c73611546294a034..2acaaa26b1ec9bb3a5e5f6659ef45b9c7573c1e1 100644 (file)
--- a/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
+++ b/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig
@@ -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
diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog

index 7444c12f4e934f78ad6f932686d2f87a2a9af9f1..591bf2bf985c58b8f51c40e133def7c2faac8d49 100644 (file)
--- a/Source/ThirdParty/libwebrtc/ChangeLog
+++ b/Source/ThirdParty/libwebrtc/ChangeLog
@@ -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
diff --git a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig

index e3d850b56713fb6124e31d4a19154c7ba37eb438..974d2a29d812f24713e0dc3d60ddc6534a122ae3 100644 (file)
--- a/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig

index eef8ebc4c1fd95a28ee79b491b4d5c7e39700868..11013843a33da6b85370737736d8faba6cec9cb2 100644 (file)
--- a/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig

index 277cb04932ebec28f41d11a722c3b4cfd6df26b6..1fb1cc40d4423fe447d0680703b6c606394a019a 100644 (file)
--- a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog

index 6ef1e68e4c3d64a98811177e4ba2ab6312c670c1..4998ecb4a59f078f2accea1ff96d146b3d8c0ba0 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -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.
diff --git a/Source/WTF/Configurations/Base.xcconfig b/Source/WTF/Configurations/Base.xcconfig

index 6ce73302dc4c045b55b33258eeb9c8306e658093..21839ab4007b8eb0054547714ab6d3eae04cea62 100644 (file)
--- a/Source/WTF/Configurations/Base.xcconfig
+++ b/Source/WTF/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Source/WTF/Configurations/DebugRelease.xcconfig b/Source/WTF/Configurations/DebugRelease.xcconfig

index a881c985b05a1324c4d7db178f2f1e467adf0ce1..961deea53c53d2e104c57a220ee9648f48215819 100644 (file)
--- a/Source/WTF/Configurations/DebugRelease.xcconfig
+++ b/Source/WTF/Configurations/DebugRelease.xcconfig
@@ -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_$(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;
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index 622c3b57a3d281a0c4e962aaf74869d0b1b727a7..fdf82980f6ab795456db0c82067ae0412878f3b9 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -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
diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig

index 0fd2e305dff93578299ad4f4932ed004191a5ee6..00372b3dac75d2df9ee15e47f348c733f9d5d7dc 100644 (file)
--- a/Source/WebCore/Configurations/Base.xcconfig
+++ b/Source/WebCore/Configurations/Base.xcconfig
@@ -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);
diff --git a/Source/WebCore/Configurations/DebugRelease.xcconfig b/Source/WebCore/Configurations/DebugRelease.xcconfig

index 76f9e6013f624effd617a80a3720f3aaff2318ba..1535a028999cd2f5c2efb30d7bc4b63158078a3c 100644 (file)
--- a/Source/WebCore/Configurations/DebugRelease.xcconfig
+++ b/Source/WebCore/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/WebCore/Configurations/Version.xcconfig b/Source/WebCore/Configurations/Version.xcconfig

index 5bc80c8a3cd897e16fe1796a039a671ffac8444f..93437f8813079f26bd39b9b26ffacfa7e7aeb880 100644 (file)
--- a/Source/WebCore/Configurations/Version.xcconfig
+++ b/Source/WebCore/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog

index 886d6291b3e769cb0725f1704227afc9889563f0..6687ec99e087ea0a13a44572d25eedb5b264751f 100644 (file)
--- a/Source/WebCore/PAL/ChangeLog
+++ b/Source/WebCore/PAL/ChangeLog
@@ -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
diff --git a/Source/WebCore/PAL/Configurations/Base.xcconfig b/Source/WebCore/PAL/Configurations/Base.xcconfig

index 8100fbacdd4c8630ddc177cddd54915ae2ef59ec..873742f1da7c872f6360772cd0580a7c60b3c324 100644 (file)
--- a/Source/WebCore/PAL/Configurations/Base.xcconfig
+++ b/Source/WebCore/PAL/Configurations/Base.xcconfig
@@ -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
  
diff --git a/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig b/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

index 2523f9bbdce54b87682f67dee0b2408380180174..c07cb7c206fb5785f1b5792dfbce4673c260fda8 100644 (file)
--- a/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
+++ b/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/WebCore/PAL/Configurations/Version.xcconfig b/Source/WebCore/PAL/Configurations/Version.xcconfig

index 25720f9ecedeba52c10072a98dc50004f51b6d2f..96c87e9f7d83b687937ec58ed42e1744e272ff96 100644 (file)
--- a/Source/WebCore/PAL/Configurations/Version.xcconfig
+++ b/Source/WebCore/PAL/Configurations/Version.xcconfig
@@ -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.
diff --git a/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog

index cac6cb3ecc42d25c5c1f80f253998041f6880436..b44f6ade37d59084fbd6d57f2fc4e7c2fe6ccd19 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -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
diff --git a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

index ea3c5b99c9f404fb03549cb864aec3c60dd42d1e..94206cc77cd2699342857ccd4ad81ce924d00d10 100644 (file)
--- a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
+++ b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig

index 5ceaa45d4f8d6246030df915605c4dd478e2d9ce..2c984bb246a8e0076abbcd2e6361546b2fef540c 100644 (file)
--- a/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog

index 7903351a1a3b04f431aa89b27e9d6f59b340d217..4fadd130870b5b64fb8814cc7cdc171132c20082 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -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  Tim Horton  <timothy_horton@apple.com>
  
          sysctl() fails due to sandbox violation
diff --git a/Source/WebKit/Configurations/Base.xcconfig b/Source/WebKit/Configurations/Base.xcconfig

index d66b24d12a56601c76cf0c186318190a1eeb2475..59bc1e965e74b333421f314844925c9cd8e47860 100644 (file)
--- a/Source/WebKit/Configurations/Base.xcconfig
+++ b/Source/WebKit/Configurations/Base.xcconfig
@@ -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);
diff --git a/Source/WebKit/Configurations/DebugRelease.xcconfig b/Source/WebKit/Configurations/DebugRelease.xcconfig

index fea5b2c6dc54f200ff359d1d3d4331fb72d6be71..51a61ec7fb4062dc51602a2eb01bba751fb809e7 100644 (file)
--- a/Source/WebKit/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKit/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/WebKit/Configurations/Version.xcconfig b/Source/WebKit/Configurations/Version.xcconfig

index 416e6e9416f516a94952b2ef945422b7ae48c8fa..0a8a08950b65af35a0dc06237598d1f067f0c1f6 100644 (file)
--- a/Source/WebKit/Configurations/Version.xcconfig
+++ b/Source/WebKit/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog

index 494917f9fb16edf1fe10224141a8bac37e6796c2..22ec0e19ff5e989b7fc4e601f9acb45e72a2ed9d 100644 (file)
--- a/Source/WebKitLegacy/mac/ChangeLog
+++ b/Source/WebKitLegacy/mac/ChangeLog
@@ -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
diff --git a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig

index 32e2874dfb3ecddd0fc6eeceb6ff23cfd134d47a..2d70cd400e4b265ec7d4a3016da25fb6ee04dfee 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/Base.xcconfig
@@ -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);
diff --git a/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig b/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig

index 0eb19201ca8e8b4161a8c8ce2bfb07e1ac921409..a6144fb2afc6565ce973fbc0539d8109975b9d8f 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig

index 5bc80c8a3cd897e16fe1796a039a671ffac8444f..93437f8813079f26bd39b9b26ffacfa7e7aeb880 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
@@ -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;
  
diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig

index b413d9981ae9d48b0081b2ccc2dac56a5d9c892c..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog

index 6b00ed873bd10265534742584e9c68c31c032333..adc0b89467a6e99696d32fe8c27e48e3b39221be 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -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
diff --git a/Source/bmalloc/Configurations/Base.xcconfig b/Source/bmalloc/Configurations/Base.xcconfig

index f8087e6bb76b3300a91f0d74beb1d70cf00e4252..6828d83e4017cfd15eb0c6dff42346c2ba94100a 100644 (file)
--- a/Source/bmalloc/Configurations/Base.xcconfig
+++ b/Source/bmalloc/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Source/bmalloc/Configurations/DebugRelease.xcconfig b/Source/bmalloc/Configurations/DebugRelease.xcconfig

index a881c985b05a1324c4d7db178f2f1e467adf0ce1..961deea53c53d2e104c57a220ee9648f48215819 100644 (file)
--- a/Source/bmalloc/Configurations/DebugRelease.xcconfig
+++ b/Source/bmalloc/Configurations/DebugRelease.xcconfig
@@ -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_$(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;
diff --git a/Tools/ChangeLog b/Tools/ChangeLog

index 8c0e431b62c3540a7eb60ec25aa541af44d09547..3e5260843b6871996f4bd3679404054f630eb620 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,27 @@
+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
diff --git a/Tools/ContentExtensionTester/Configurations/Base.xcconfig b/Tools/ContentExtensionTester/Configurations/Base.xcconfig

index 6b6d703739a156f7eff64f8207cad223d5551ebb..478c4cddf614ef7cbd416187b987ba9b3f1e9252 100644 (file)
--- a/Tools/ContentExtensionTester/Configurations/Base.xcconfig
+++ b/Tools/ContentExtensionTester/Configurations/Base.xcconfig
@@ -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.
diff --git a/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig b/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig

index 34610f05f87ba5b89482e8e55af5d7760adbd209..9a906eaea15e4821bb18b53c8887420bc60ac06f 100644 (file)
--- a/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig
+++ b/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig
@@ -25,19 +25,23 @@
  
  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;
diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

index 3ed63a636ece5f23e3b10abeb2d31e2c58ffd852..9b9c68091b17b4d1cfab4b1d24ac2cf88d80d215 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

index f6a6f59fe804f39d029cfab0bc486ce139b27095..d68a05fbc8e8c102206438e175ecb160fd29d69e 100644 (file)
--- a/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
+++ b/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Tools/ImageDiff/cg/Configurations/Base.xcconfig b/Tools/ImageDiff/cg/Configurations/Base.xcconfig

index 4b5d53574ff538bd73c0b9c50d9fd317fee2c04c..2d895b5856d0c218b3c0c48dd7f389fa07693f41 100644 (file)
--- a/Tools/ImageDiff/cg/Configurations/Base.xcconfig
+++ b/Tools/ImageDiff/cg/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig b/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig

index a33d0abb75d341bf3e58216301e8ba30932fac31..fecbff0e09c641839897ed7f661cf59ffeb78ed9 100644 (file)
--- a/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
+++ b/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Tools/MiniBrowser/Configurations/Base.xcconfig b/Tools/MiniBrowser/Configurations/Base.xcconfig

index aa24af7a7837d16f4687aa68f8e541f7b12acab3..a02ba10f9224671ebe3d56ef39c5fce848f572f3 100644 (file)
--- a/Tools/MiniBrowser/Configurations/Base.xcconfig
+++ b/Tools/MiniBrowser/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig

index 87e131c6746c7b7ecab33162b40f2b4a5aa0c673..6ac9ad1435d04612e5f9995687043af72a163299 100644 (file)
--- a/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
+++ b/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Tools/TestWebKitAPI/Configurations/Base.xcconfig b/Tools/TestWebKitAPI/Configurations/Base.xcconfig

index 5e857aa17adef225305915e17c6c70e522d488d0..43bb17bec6550b3747ad598529a4d37b0503867c 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/Base.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/Base.xcconfig
@@ -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);
diff --git a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig

index 73fb86b7199e0df1cf22a7f8c7e8e59775c84df3..eec6567ecc1684ae329f8ebc056e7477dbfdaba3 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
@@ -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);
diff --git a/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig b/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig

index 45bb2a44a80da9547f4a26102d2da1301727a5c2..46d849bb54bbeb151cc365972475b6090f0c306f 100644 (file)
--- a/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
+++ b/Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
@@ -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;
diff --git a/Tools/WebEditingTester/Configurations/Base.xcconfig b/Tools/WebEditingTester/Configurations/Base.xcconfig

index 0f2eb9cbaf215aea652b7e5ae8afa273198f018a..eef689b8ae88c9ddd87b46eba7d64fe07fc39293 100644 (file)
--- a/Tools/WebEditingTester/Configurations/Base.xcconfig
+++ b/Tools/WebEditingTester/Configurations/Base.xcconfig
@@ -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;
diff --git a/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig b/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig

index 63d197305ed044640e1ad557dcd54f2e0fff0c5f..21d77532325c0a9bb93086f1f6a7ae769c96c82a 100644 (file)
--- a/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
+++ b/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
@@ -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;
diff --git a/Tools/WebKitTestRunner/Configurations/Base.xcconfig b/Tools/WebKitTestRunner/Configurations/Base.xcconfig

index 783644e6dc8557aa048220b3f2259b2d8fc7adab..c13f390000f54c284a5577be5f5c546869db7aac 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/Base.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/Base.xcconfig
@@ -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);
diff --git a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

index e257c45e3e016957ae96e986e8b753414a326dc5..e4b4d6ec58a811897e6225faee036662ee5e02c6 100644 (file)
--- a/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
+++ b/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
@@ -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));
diff --git a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig

index 1c1901b6fccdf8577423f2bdcd1b8182a0da1f7d..fa29f5e66450e8db00a4f2ce6352b39cf307401e 100644 (file)
--- a/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
+++ b/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig
@@ -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;
  
diff --git a/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig b/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

index 8ef4f7aec00c657dd85dbf44f2fc11937919b6d7..a754910aa2a35351c6e7de0aea7cb3ea078593d2 100644 (file)
--- a/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig
+++ b/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig
@@ -25,19 +25,23 @@
  
  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;
author	timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
committer	timothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 22 Jun 2020 20:48:59 +0000 (20:48 +0000)
Source/JavaScriptCore/ChangeLog		patch \| blob \| history
Source/JavaScriptCore/Configurations/Base.xcconfig		patch \| blob \| history
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/JavaScriptCore/Configurations/Version.xcconfig		patch \| blob \| history
Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/ThirdParty/ANGLE/ChangeLog		patch \| blob \| history
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig		patch \| blob \| history
Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/ThirdParty/ANGLE/Configurations/Version.xcconfig		patch \| blob \| history
Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/ThirdParty/ChangeLog		patch \| blob \| history
Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig		patch \| blob \| history
Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig		patch \| blob \| history
Source/ThirdParty/libwebrtc/ChangeLog		patch \| blob \| history
Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig		patch \| blob \| history
Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig		patch \| blob \| history
Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/WTF/ChangeLog		patch \| blob \| history
Source/WTF/Configurations/Base.xcconfig		patch \| blob \| history
Source/WTF/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/Configurations/Base.xcconfig		patch \| blob \| history
Source/WebCore/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebCore/Configurations/Version.xcconfig		patch \| blob \| history
Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/WebCore/PAL/ChangeLog		patch \| blob \| history
Source/WebCore/PAL/Configurations/Base.xcconfig		patch \| blob \| history
Source/WebCore/PAL/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebCore/PAL/Configurations/Version.xcconfig		patch \| blob \| history
Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/WebInspectorUI/ChangeLog		patch \| blob \| history
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebInspectorUI/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/WebKit/ChangeLog		patch \| blob \| history
Source/WebKit/Configurations/Base.xcconfig		patch \| blob \| history
Source/WebKit/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebKit/Configurations/Version.xcconfig		patch \| blob \| history
Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/WebKitLegacy/mac/ChangeLog		patch \| blob \| history
Source/WebKitLegacy/mac/Configurations/Base.xcconfig		patch \| blob \| history
Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebKitLegacy/mac/Configurations/Version.xcconfig		patch \| blob \| history
Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Source/bmalloc/ChangeLog		patch \| blob \| history
Source/bmalloc/Configurations/Base.xcconfig		patch \| blob \| history
Source/bmalloc/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/ChangeLog		patch \| blob \| history
Tools/ContentExtensionTester/Configurations/Base.xcconfig		patch \| blob \| history
Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig		patch \| blob \| history
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/ImageDiff/cg/Configurations/Base.xcconfig		patch \| blob \| history
Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/MiniBrowser/Configurations/Base.xcconfig		patch \| blob \| history
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/TestWebKitAPI/Configurations/Base.xcconfig		patch \| blob \| history
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig		patch \| blob \| history
Tools/WebEditingTester/Configurations/Base.xcconfig		patch \| blob \| history
Tools/WebEditingTester/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/WebKitTestRunner/Configurations/Base.xcconfig		patch \| blob \| history
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig		patch \| blob \| history
Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig		patch \| blob \| history