Changeset 227156 in webkit


Ignore:
Timestamp:
Jan 18, 2018, 11:49:51 AM (7 years ago)
Author:
mitz@apple.com
Message:

[Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
​https://bugs.webkit.org/show_bug.cgi?id=181803

Reviewed by Tim Horton.

Source/bmalloc:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • Configurations/Version.xcconfig: Updated.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.

Source/ThirdParty/libwebrtc:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.
  • Configurations/opus.xcconfig: Adopted macOSTargetConditionals helper.

Source/WebCore:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • Configurations/Version.xcconfig: Updated.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.

Source/WebCore/PAL:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • Configurations/Version.xcconfig: Updated.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.

Source/WebInspectorUI:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/Version.xcconfig: Ditto.

Source/WebKit:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • Configurations/Version.xcconfig: Updated.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.

Source/WebKitLegacy/mac:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • Configurations/Version.xcconfig: Updated.
  • Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.

Source/WTF:

  • Configurations/Base.xcconfig: Updated.
  • Configurations/DebugRelease.xcconfig: Updated.

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig: Updated.
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: Ditto.
  • ImageDiff/cg/Configurations/Base.xcconfig: Ditto.
  • ImageDiff/cg/Configurations/DebugRelease.xcconfig: Ditto.
  • MiniBrowser/Configurations/Base.xcconfig: Ditto.
  • MiniBrowser/Configurations/DebugRelease.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/Base.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/DebugRelease.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
  • TestWebKitAPI/Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings useful for defining settings that depend on the target macOS version.
  • WebKitTestRunner/Configurations/Base.xcconfig: Updated.
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig: Updated.
Location:
trunk
Files:
7 added
54 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r227152 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
     11        * Configurations/Version.xcconfig: Updated.
     12        * Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings
     13          useful for defining settings that depend on the target macOS version.
     14
    1152018-01-18  Michael Saboff  <msaboff@apple.com>
    216

  • trunk/Source/JavaScriptCore/Configurations/Base.xcconfig

    r225958 r227156  
    9999TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    100100TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     101TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    101102
    102103AD_HOC_CODE_SIGNING_ALLOWED = YES;

  • trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Source/JavaScriptCore/Configurations/Version.xcconfig

    r227100 r227156  
    4040SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    4141SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     42SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4243
    4344// The production build always uses the full version with a system version prefix.

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r226647 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10
    1112018-01-09  Dan Bernstein  <mitz@apple.com>
    212

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r225958 r227156  
    5959TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6060TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     61TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    6162
    6263SDKROOT = macosx.internal;

  • trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    1212MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    1313MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     14MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    1415
    1516GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r226506 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings
     11          useful for defining settings that depend on the target macOS version.
     12        * Configurations/opus.xcconfig: Adopted macOSTargetConditionals helper.
     13
    1142018-01-08  David Kilzer  <ddkilzer@apple.com>
    215

  • trunk/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig

    r225958 r227156  
    5959TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6060TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     61TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    6162
    6263SDKROOT = macosx.internal;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    1212MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    1313MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     14MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    1415
    1516GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig

    r215494 r227156  
     1#include "macOSTargetConditionals.xcconfig"
     2
    13PRODUCT_NAME = opus;
    24
    … …  
    2123// El Capitan and iossimulator can't use SSE4 intrinsics, but Sierra and newer can.
    2224EXCLUDED_SOURCE_FILE_NAMES_macosx_101100 = NSQ_sse.c VAD_sse.c VQ_WMat_EC_sse.c NSQ_del_dec_sse.c;
    23 SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    24 SSE4_FLAG_macosx_101200 = OPUS_X86_MAY_HAVE_SSE4_1;
    25 SSE4_FLAG_macosx_101300 = OPUS_X86_MAY_HAVE_SSE4_1;
    26 SSE4_FLAG_macosx_101400 = OPUS_X86_MAY_HAVE_SSE4_1;
     25SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG$(WK_MACOS_1012));
     26SSE4_FLAG_MACOS_SINCE_1012 = OPUS_X86_MAY_HAVE_SSE4_1;

  • trunk/Source/WTF/ChangeLog

    r227075 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Updated.
     10
    1112018-01-17  Daniel Bates  <dabates@apple.com>
    212

  • trunk/Source/WTF/Configurations/Base.xcconfig

    r225958 r227156  
    9898TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    9999TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     100TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    100101
    101102SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;

  • trunk/Source/WTF/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3434MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     36MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3637
    3738GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebCore/ChangeLog

    r227153 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
     11        * Configurations/Version.xcconfig: Updated.
     12        * Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings
     13          useful for defining settings that depend on the target macOS version.
     14
    1152018-01-18  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r226483 r227156  
    8888TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8989TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     90TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9091
    9192WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Source/WebCore/Configurations/Version.xcconfig

    r227100 r227156  
    4040SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    4141SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     42SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4243
    4344// The production build always uses the full version with a system version prefix.

  • trunk/Source/WebCore/PAL/ChangeLog

    r227103 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
     11        * Configurations/Version.xcconfig: Updated.
     12        * Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings
     13          useful for defining settings that depend on the target macOS version.
     14
    1152018-01-17  John Wilander  <wilander@apple.com>
    216

  • trunk/Source/WebCore/PAL/Configurations/Base.xcconfig

    r225958 r227156  
    8888TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8989TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     90TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9091
    9192WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9

  • trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Source/WebCore/PAL/Configurations/Version.xcconfig

    r227100 r227156  
    4040SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    4141SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     42SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4243
    4344// The production build always uses the full version with a system version prefix.

  • trunk/Source/WebInspectorUI/ChangeLog

    r227155 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/Version.xcconfig: Ditto.
     11
    1122018-01-18  Devin Rousso  <webkit@devinrousso.com>
    213

  • trunk/Source/WebInspectorUI/Configurations/Base.xcconfig

    r226499 r227156  
    6666TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6767TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     68TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    6869
    6970SDKROOT = macosx.internal;

  • trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

    r219050 r227156  
    1212MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    1313MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     14MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    1415
    1516ENGINEERING_BUILD = 1;

  • trunk/Source/WebInspectorUI/Configurations/Version.xcconfig

    r227100 r227156  
    1313SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    1414SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     15SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    1516
    1617BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

  • trunk/Source/WebKit/ChangeLog

    r227153 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
     11        * Configurations/Version.xcconfig: Updated.
     12        * Configurations/macOSTargetConditionals.xcconfig: Added.  Defines helper build settings
     13          useful for defining settings that depend on the target macOS version.
     14
    1152018-01-18  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebKit/Configurations/Base.xcconfig

    r226499 r227156  
    8888TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8989TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     90TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9091
    9192WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9

  • trunk/Source/WebKit/Configurations/DebugRelease.xcconfig

    r222897 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Source/WebKit/Configurations/Version.xcconfig

    r227100 r227156  
    4040SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    4141SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     42SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4243
    4344// The production build always uses the full version with a system version prefix.

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r227079 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals helpers.
     11        * Configurations/Version.xcconfig: Updated.
     12        * Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build settings
     13          useful for defining settings that depend on the target macOS version.
     14
    1152018-01-17  Youenn Fablet  <youenn@apple.com>
    216

  • trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig

    r226499 r227156  
    8989TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    9090TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     91TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9192
    9293WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9

  • trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig

    r222897 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig

    r227100 r227156  
    4040SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
    4141SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     42SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4243
    4344// The production build always uses the full version with a system version prefix.

  • trunk/Source/bmalloc/ChangeLog

    r226972 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * Configurations/Base.xcconfig: Updated.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10
    1112018-01-16  Michael Catanzaro  <mcatanzaro@igalia.com>
    212

  • trunk/Source/bmalloc/Configurations/Base.xcconfig

    r225958 r227156  
    9696TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    9797TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     98TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9899
    99100SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;

  • trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3434MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     36MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3637
    3738GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Tools/ChangeLog

    r227154 r227156  
     12018-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Streamline and future-proof target-macOS-version-dependent build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=181803
     5
     6        Reviewed by Tim Horton.
     7
     8        * DumpRenderTree/mac/Configurations/Base.xcconfig: Updated.
     9        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: Ditto.
     10        * ImageDiff/cg/Configurations/Base.xcconfig: Ditto.
     11        * ImageDiff/cg/Configurations/DebugRelease.xcconfig: Ditto.
     12        * MiniBrowser/Configurations/Base.xcconfig: Ditto.
     13        * MiniBrowser/Configurations/DebugRelease.xcconfig: Ditto.
     14        * TestWebKitAPI/Configurations/Base.xcconfig: Ditto.
     15        * TestWebKitAPI/Configurations/DebugRelease.xcconfig: Ditto.
     16        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Adopted macOSTargetConditionals
     17          helpers.
     18        * TestWebKitAPI/Configurations/macOSTargetConditionals.xcconfig: Added. Defines helper build
     19          settings useful for defining settings that depend on the target macOS version.
     20        * WebKitTestRunner/Configurations/Base.xcconfig: Updated.
     21        * WebKitTestRunner/Configurations/DebugRelease.xcconfig: Updated.
     22
    1232018-01-18  Ling Ho  <lingcherd_ho@apple.com>
    224

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r222897 r227156  
    9191TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    9292TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     93TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    9394
    9495SDKROOT = macosx.internal;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r222897 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3738
    3839SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));

  • trunk/Tools/ImageDiff/cg/Configurations/Base.xcconfig

    r226670 r227156  
    7373TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7474TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     75TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    7576
    7677SDKROOT = macosx.internal;

  • trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig

    r218057 r227156  
    3636MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
    3737MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
     38MACOSX_DEPLOYMENT_TARGET_macosx_101500 = 10.15;
    3839
    3940SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));

  • trunk/Tools/MiniBrowser/Configurations/Base.xcconfig

    r219648 r227156  
    6969TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7070TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     71TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    7172
    7273SDKROOT = macosx.internal;

  • trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    3738
    3839GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r219648 r227156  
    8282TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8383TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     84TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    8485
    8586SDKROOT = macosx.internal;

  • trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig

    r219082 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    3738
    3839WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);

  • trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig

    r226879 r227156  
    3232// Set any ENABLE_FEATURE_NAME macro to an empty string to disable that feature.
    3333
    34 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    35 TARGET_MAC_OS_X_VERSION_LESS_THAN_101200_101100 = YES;
    36 
    37 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300 = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101100 = YES;
    39 TARGET_MAC_OS_X_VERSION_LESS_THAN_101300_101200 = YES;
     34#include "macOSTargetConditionals.xcconfig"
    4035
    4136ENABLE_3D_TRANSFORMS = ENABLE_3D_TRANSFORMS;
    … …  
    4742ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    4843
    49 DISABLE_APPLE_PAY_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101200);
    50 ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY_IF_NOT_$(DISABLE_APPLE_PAY_macosx));
    51 ENABLE_APPLE_PAY_IF_NOT_ = $(ENABLE_APPLE_PAY_IF_NOT_NO);
    52 ENABLE_APPLE_PAY_IF_NOT_NO = ENABLE_APPLE_PAY;
    53 ENABLE_APPLE_PAY_IF_NOT_YES = ;
     44ENABLE_APPLE_PAY[sdk=macosx*] = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
     45ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
    5446
    5547ENABLE_APPLE_PAY_SESSION_V3[sdk=iphone*] = $(ENABLE_APPLE_PAY_SESSION_V3_$(PLATFORM_NAME));
    … …  
    5951ENABLE_APPLE_PAY_SESSION_V3[sdk=iphonesimulator10*] = ;
    6052
    61 DISABLE_APPLE_PAY_SESSION_V3_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    62 ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_$(DISABLE_APPLE_PAY_SESSION_V3_macosx));
    63 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_ = $(ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO);
    64 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_NO = ENABLE_APPLE_PAY_SESSION_V3;
    65 ENABLE_APPLE_PAY_SESSION_V3_IF_NOT_YES = ;
     53ENABLE_APPLE_PAY_SESSION_V3[sdk=macosx*] = $(ENABLE_APPLE_PAY_SESSION_V3$(WK_MACOS_1013));
     54ENABLE_APPLE_PAY_SESSION_V3_MACOS_SINCE_1013 = ENABLE_APPLE_PAY_SESSION_V3;
    6655
    6756ENABLE_FULLSCREEN_API[sdk=iphone*] = $(ENABLE_FULLSCREEN_API_$(PLATFORM_NAME));
    … …  
    206195ENABLE_VIDEO = ENABLE_VIDEO;
    207196ENABLE_VIDEO_PRESENTATION_MODE[sdk=iphone*] = ENABLE_VIDEO_PRESENTATION_MODE;
    208 ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    209 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101200 = ENABLE_VIDEO_PRESENTATION_MODE;
    210 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101300 = ENABLE_VIDEO_PRESENTATION_MODE;
    211 ENABLE_VIDEO_PRESENTATION_MODE_macosx_101400 = ENABLE_VIDEO_PRESENTATION_MODE;
     197ENABLE_VIDEO_PRESENTATION_MODE[sdk=macosx*] = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
     198ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
    212199ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
    213200ENABLE_DATACUE_VALUE = ENABLE_DATACUE_VALUE;
    … …  
    237224ENABLE_VARIATION_FONTS[sdk=iphonesimulator10*] = ;
    238225
    239 DISABLE_VARIATION_FONTS_macosx = $(TARGET_MAC_OS_X_VERSION_LESS_THAN_101300);
    240 ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS_IF_NOT_$(DISABLE_VARIATION_FONTS_macosx));
    241 ENABLE_VARIATION_FONTS_IF_NOT_ = $(ENABLE_VARIATION_FONTS_IF_NOT_NO);
    242 ENABLE_VARIATION_FONTS_IF_NOT_NO = ENABLE_VARIATION_FONTS;
    243 ENABLE_VARIATION_FONTS_IF_NOT_YES = ;
     226ENABLE_VARIATION_FONTS[sdk=macosx*] = $(ENABLE_VARIATION_FONTS$(WK_MACOS_1013));
     227ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
    244228
    245229ENABLE_DRAG_SUPPORT[sdk=iphone*] = $(ENABLE_DRAG_SUPPORT_$(PLATFORM_NAME));

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r222897 r227156  
    6565TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6666TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
     67TARGET_MAC_OS_X_VERSION_MAJOR_15 = 101500;
    6768
    6869AD_HOC_CODE_SIGNING_ALLOWED = YES;

  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r222897 r227156  
    3535MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    3636MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
     37MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    3738
    3839SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
Note: See TracChangeset for help on using the changeset viewer.