[macOS] Harden more build configurations against macOS versions 11 and higher as...
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2020 01:25:46 +0000 (01:25 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2020 01:25:46 +0000 (01:25 +0000)
https://bugs.webkit.org/show_bug.cgi?id=217595

Reviewed by Alexey Proskuryakov.

PerformanceTests:

* MediaTime/Configurations/Base.xcconfig: Updated to same idiom used elsewhere.

Tools:

* ContentExtensionTester/Configurations/Base.xcconfig: Updated to same idiom used elsewhere.
* DumpRenderTree/mac/Configurations/Base.xcconfig: Ditto.
* ImageDiff/cg/Configurations/Base.xcconfig: Ditto.
* WebKitTestRunner/Configurations/Base.xcconfig: Ditto.
* lldb/lldbWebKitTester/Configurations/Base.xcconfig: Ditto.

* Scripts/webkitpy/common/config/contributors.json: Added contributor Luming Yin, an engineer who works on Safari at
Apple who has been contributing build fixes like these.

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

PerformanceTests/ChangeLog
PerformanceTests/MediaTime/Configurations/Base.xcconfig
Tools/ChangeLog
Tools/ContentExtensionTester/Configurations/Base.xcconfig
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
Tools/ImageDiff/cg/Configurations/Base.xcconfig
Tools/Scripts/webkitpy/common/config/contributors.json
Tools/WebKitTestRunner/Configurations/Base.xcconfig
Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig

index 6106ecab1ca89af794eafee5af4cfcd1fdfbf727..6cacdd555bd4e4bb1a1f612c133dd83eaaf3f059 100644 (file)
@@ -1,3 +1,12 @@
+2020-10-11  Darin Adler  <darin@apple.com>
+
+        [macOS] Harden more build configurations against macOS versions 11 and higher as well as inclusion of patch versions
+        https://bugs.webkit.org/show_bug.cgi?id=217595
+
+        Reviewed by Alexey Proskuryakov.
+
+        * MediaTime/Configurations/Base.xcconfig: Updated to same idiom used elsewhere.
+
 2020-07-30  Jer Noble  <jer.noble@apple.com>
 
         [Cocoa] Make DecoderTest run against .mp4 files; add rate-limiting.
index 02699a9f7f36ed6a57dfd2e4f20f2eb6fd1c41f6..5ffbe9858ebc283ad69b8783d10c87d374584b97 100644 (file)
@@ -85,13 +85,14 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla;
 HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(MACOSX_DEPLOYMENT_TARGET:base)$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_10_13 = 101300;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500;
-TARGET_MAC_OS_X_VERSION_MAJOR_10_16 = 101600;
-TARGET_MAC_OS_X_VERSION_MAJOR_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
index 556ba2dbc18486b3abff4c5af04e8105063bc49c..ac57cda9377112e7920fa152af9cdee2e62659ac 100644 (file)
@@ -1,3 +1,19 @@
+2020-10-11  Darin Adler  <darin@apple.com>
+
+        [macOS] Harden more build configurations against macOS versions 11 and higher as well as inclusion of patch versions
+        https://bugs.webkit.org/show_bug.cgi?id=217595
+
+        Reviewed by Alexey Proskuryakov.
+
+        * ContentExtensionTester/Configurations/Base.xcconfig: Updated to same idiom used elsewhere.
+        * DumpRenderTree/mac/Configurations/Base.xcconfig: Ditto.
+        * ImageDiff/cg/Configurations/Base.xcconfig: Ditto.
+        * WebKitTestRunner/Configurations/Base.xcconfig: Ditto.
+        * lldb/lldbWebKitTester/Configurations/Base.xcconfig: Ditto.
+
+        * Scripts/webkitpy/common/config/contributors.json: Added contributor Luming Yin, an engineer who works on Safari at
+        Apple who has been contributing build fixes like these.
+
 2020-10-10  Darin Adler  <darin@apple.com>
 
         REGRESSION (r267761): editing/mac/spelling/autocorrection-contraction.html is a constant timeout on macOS wk2 Debug
index 3ef28aa27c23c5e67b2dbc6e1733c8ce0d9ce6cb..286fb6457988be9d25686544cf7a57c1e406b059 100644 (file)
@@ -67,12 +67,14 @@ 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: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_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
 // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
index 30215b1f21515a5cbd38380164209be26fb819ba..9c682b4b5b5e4c93df9f34c3ba84eb292a982c25 100644 (file)
@@ -89,12 +89,14 @@ 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: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_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 SDKROOT = macosx.internal;
 
index a8641562da25e9d80544a7206e9ef8bbdc25bd9c..8459fa3564c12fb5851250c232955571442e84f5 100644 (file)
@@ -69,12 +69,14 @@ 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: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_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 SDKROOT = macosx.internal;
 
index e9b396fef2dd94ae8372acd641b4583a2cb14936..dd53f47856eb4a7daaeb4d0159398df74458fe62 100644 (file)
          "macpherson"
       ]
    },
+   "Luming Yin" : {
+      "emails" : [
+         "luming_yin@apple.com"
+      ]
+   },
    "L\u00e1szl\u00f3 Lang\u00f3" : {
       "emails" : [
          "llango.u-szeged@partner.samsung.com",
       ],
       "status" : "reviewer"
    }
-}
\ No newline at end of file
+}
index d1e1258c4c3612f7a3ff53d32760be161d9b7acf..53aa1466d47484b9b35c1b7dfd07b3c26c433eb6 100644 (file)
@@ -77,12 +77,14 @@ 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: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_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
 WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
index cfd3f3c7255fcab5eb572a3b6cf076f6368be2a2..b5a1f6841471060d3f943825bd0335976c10f632 100644 (file)
@@ -86,12 +86,14 @@ 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: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_11_0 = 110000;
-TARGET_MAC_OS_X_VERSION_MAJOR_12_0 = 120000;
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
+TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
+
+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER))
+TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MACOSX_DEPLOYMENT_TARGET:base:base)0000
+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
 
 SUPPORTED_PLATFORMS = macosx;