Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (275081 => 275082)
--- trunk/Source/_javascript_Core/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,14 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Saam Barati <[email protected]>
validate untagArrayPtr
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -47,6 +47,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/_javascript_Core/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (275081 => 275082)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,14 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Kyle Piddington <[email protected]>
ANGLE Metal crash ASAN webgl/1.0.3/conformance/misc/object-deletion-behaviour.html
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -24,6 +24,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (275081 => 275082)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,14 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Jessie Berlin <[email protected]>
Remove 10.13 DEPLOYMENT_TARGETs and SYSTEM_VERSION_PREFIXs
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -48,6 +48,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/WTF/ChangeLog (275081 => 275082)
--- trunk/Source/WTF/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WTF/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,12 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-03-25 Megan Gardner <[email protected]>
Have App Highlights be a Configuration Setting instead of an internal Preference setting.
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -46,6 +46,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebCore/ChangeLog (275081 => 275082)
--- trunk/Source/WebCore/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,15 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebCore.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Alex Christensen <[email protected]>
Allow WKContentRuleList to block only in frames or only in main frame
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -47,6 +47,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -188,13 +188,12 @@
TEXT_BASED_API_FILE = WebCore.tbd
WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
-WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphoneos = YES;
+WK_HAVE_URL_FORMATTING_iphonesimulator = YES;
+WK_HAVE_URL_FORMATTING_watchos = YES;
+WK_HAVE_URL_FORMATTING_watchsimulator = YES;
WK_HAVE_URL_FORMATTING_appletvos = NO
WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
-WK_HAVE_URL_FORMATTING_maccatalyst = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_maccatalyst = YES;
WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
-WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;
Modified: trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/WebCore/PAL/ChangeLog (275081 => 275082)
--- trunk/Source/WebCore/PAL/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/PAL/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,14 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Jessie Berlin <[email protected]>
Remove 10.13 DEPLOYMENT_TARGETs and SYSTEM_VERSION_PREFIXs
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -47,6 +47,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -39,6 +39,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
// The production build always uses the full version with a system version prefix.
BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
Modified: trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/WebInspectorUI/ChangeLog (275081 => 275082)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,13 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+
2021-03-25 Jessie Berlin <[email protected]>
Remove 10.13 DEPLOYMENT_TARGETs and SYSTEM_VERSION_PREFIXs
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -24,6 +24,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -12,6 +12,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);
Modified: trunk/Source/WebKit/ChangeLog (275081 => 275082)
--- trunk/Source/WebKit/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKit/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,15 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKit.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Alex Christensen <[email protected]>
Allow WKContentRuleList to block only in frames or only in main frame
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -47,6 +47,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/WebKit/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (275081 => 275082)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -182,13 +182,12 @@
WK_RELOCATABLE_FRAMEWORK_LDFLAGS_YES_macosx = -Wl,-not_for_dyld_shared_cache;
WK_HAVE_URL_FORMATTING = $(WK_HAVE_URL_FORMATTING_$(WK_PLATFORM_NAME));
-WK_HAVE_URL_FORMATTING_iphoneos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_maccatalyst = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_iphonesimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_watchos = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
-WK_HAVE_URL_FORMATTING_watchsimulator = $(WK_HAVE_URL_FORMATTING$(WK_IOS_12));
+WK_HAVE_URL_FORMATTING_iphoneos = YES;
+WK_HAVE_URL_FORMATTING_maccatalyst = YES;
+WK_HAVE_URL_FORMATTING_iphonesimulator = YES;
+WK_HAVE_URL_FORMATTING_watchos = YES;
+WK_HAVE_URL_FORMATTING_watchsimulator = YES;
WK_HAVE_URL_FORMATTING_appletvos = NO
WK_HAVE_URL_FORMATTING_appletvsimulator = NO;
WK_HAVE_URL_FORMATTING_macosx = $(WK_HAVE_URL_FORMATTING$(WK_MACOS_1014));
WK_HAVE_URL_FORMATTING_MACOS_SINCE_1014 = YES;
-WK_HAVE_URL_FORMATTING_IOS_SINCE_12 = YES;
Modified: trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,52 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_14_11 = YES;
-WK_IOS_BEFORE_14_12 = YES;
WK_IOS_BEFORE_14_13 = YES;
WK_IOS_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_15_11 = YES;
-WK_IOS_BEFORE_15_12 = YES;
WK_IOS_BEFORE_15_13 = YES;
WK_IOS_BEFORE_15_14 = 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_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_15 = $(WK_IOS_12_15_$(WK_IOS_BEFORE_12));
-WK_IOS_12_15_ = $(WK_IOS_15);
-WK_IOS_12_15_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -185,6 +190,10 @@
WK_IOS_13_15_ = $(WK_IOS_15);
WK_IOS_13_15_YES = _IOS_BEFORE_13;
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
@@ -193,6 +202,18 @@
WK_IOS_14_15_ = $(WK_IOS_15);
WK_IOS_14_15_YES = _IOS_BEFORE_14;
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
WK_IOS_15_ = _IOS_SINCE_15;
WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (275081 => 275082)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,14 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Configurations/Version.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig:
+
2021-03-25 Jessie Berlin <[email protected]>
Remove 10.13 DEPLOYMENT_TARGETs and SYSTEM_VERSION_PREFIXs
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -47,6 +47,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (275081 => 275082)
--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -38,6 +38,7 @@
SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
SYSTEM_VERSION_PREFIX_macosx_110000 = 16;
SYSTEM_VERSION_PREFIX_macosx_120000 = 17;
+SYSTEM_VERSION_PREFIX_macosx_130000 = 18;
SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
// The production build always uses the full version with a system version prefix.
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig (275081 => 275082)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -71,6 +71,13 @@
WK_MACOS_BEFORE_1200_101500 = YES;
WK_MACOS_BEFORE_1200_110000 = YES;
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
WK_MACOS_1014_ = _MACOS_SINCE_1014;
WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
@@ -91,6 +98,10 @@
WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_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;
@@ -107,6 +118,10 @@
WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_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;
@@ -119,6 +134,10 @@
WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_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;
@@ -127,42 +146,38 @@
WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
WK_MACOS_1200_ = _MACOS_SINCE_1200;
WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
-// iOS
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
-WK_IOS_BEFORE_11 = $(WK_IOS_BEFORE_11_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
-WK_IOS_BEFORE_12 = $(WK_IOS_BEFORE_12_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_12_11 = YES;
+// iOS
WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-WK_IOS_BEFORE_13_11 = YES;
-WK_IOS_BEFORE_13_12 = YES;
WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
-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_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
-WK_IOS_12 = $(WK_IOS_12_$(WK_IOS_BEFORE_12));
-WK_IOS_12_ = _IOS_SINCE_12;
-WK_IOS_12_YES = _IOS_BEFORE_12;
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
-WK_IOS_12_13 = $(WK_IOS_12_13_$(WK_IOS_BEFORE_12));
-WK_IOS_12_13_ = $(WK_IOS_13);
-WK_IOS_12_13_YES = _IOS_BEFORE_12;
-
-WK_IOS_12_14 = $(WK_IOS_12_14_$(WK_IOS_BEFORE_12));
-WK_IOS_12_14_ = $(WK_IOS_14);
-WK_IOS_12_14_YES = _IOS_BEFORE_12;
-
WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
WK_IOS_13_ = _IOS_SINCE_13;
WK_IOS_13_YES = _IOS_BEFORE_13;
@@ -171,6 +186,34 @@
WK_IOS_13_14_ = $(WK_IOS_14);
WK_IOS_13_14_YES = _IOS_BEFORE_13;
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
WK_IOS_14_ = _IOS_SINCE_14;
WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
Modified: trunk/Source/bmalloc/ChangeLog (275081 => 275082)
--- trunk/Source/bmalloc/ChangeLog 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/bmalloc/ChangeLog 2021-03-26 07:02:15 UTC (rev 275082)
@@ -1,3 +1,12 @@
+2021-03-26 Jessie Berlin <[email protected]>
+
+ Update the BEFORE/SINCE, SYSTEM_VERSION_PREFIX, and MACOSX_DEPLOYMENT_TARGET flags
+ https://bugs.webkit.org/show_bug.cgi?id=223779
+
+ Reviewed by Tim Horton.
+
+ * Configurations/DebugRelease.xcconfig:
+
2021-03-25 Jessie Berlin <[email protected]>
Remove 10.13 DEPLOYMENT_TARGETs and SYSTEM_VERSION_PREFIXs
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (275081 => 275082)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2021-03-26 06:57:35 UTC (rev 275081)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2021-03-26 07:02:15 UTC (rev 275082)
@@ -46,6 +46,7 @@
MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
+MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
