⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286958 in webkit


Ignore:
Timestamp:
Dec 13, 2021, 10:35:11 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Deployment target for macOS 11+ does not follow minor version bumps
​https://bugs.webkit.org/show_bug.cgi?id=233906

Patch by Elliott Williams <Elliott Williams> on 2021-12-13
Reviewed by Alexey Proskuryakov.
Source/bmalloc:

  • Configurations/DebugRelease.xcconfig:

Source/JavaScriptCore:

  • Configurations/DebugRelease.xcconfig:

Source/WebCore:

Changes the deployment target for macOS 11 and above to use the default SDK version, instead
of looking up a version using TARGET_MAC_OS_X_VERSION_MAJOR.

Prior to macOS 11, the deployment target did NOT change between minor versions (e.g.
"10.15" was the deployment target for all builds of 10.15.x). Now, minor releases may
change the deployment target, so we cannot rely solely on the MAC_OS_X_VERSION_MAJOR to
determine what deployment target to build for.

Since the deployment target may change within different versions of a major release,
TARGET_MAC_OS_X_VERSION_MAJOR is no longer useful for selecting a deployment target. It
should be considered read-only. To build for a non-default macOS version, set the
deployment target directly.

Reverts changes made in ​https://commits.webkit.org/230363@main, now that Xcode has been
fixed in rdar://problem/70185899.

  • Configurations/DebugRelease.xcconfig:
  • platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::variationAxes): Removes a defensive unguarded-availability pragma, now that the
underlying issue is fixed.

Source/WebGPU:

  • Configurations/DebugRelease.xcconfig:

Source/WebInspectorUI:

  • Configurations/DebugRelease.xcconfig:

Source/WebKit:

  • Configurations/DebugRelease.xcconfig:

Source/WTF:

  • Configurations/DebugRelease.xcconfig:
  • wtf/PlatformHave.h: Add feature define which has been public since macOS 11.0
Location:
trunk
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig

    r268420 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig

    r268420 r286958  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
    29 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    30 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    31 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    32 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    33 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    38 
    39 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    40 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    41 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    42 
    43 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    44 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    45 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    46 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    47 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    48 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    49 
    5029GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5130DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/JavaScriptCore/ChangeLog

    r286946 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9
    1102021-12-13  Adrian Perez de Castro  <aperez@igalia.com>
    211

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

    r275082 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

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

    r275082 r286958  
    55
    66ONLY_ACTIVE_ARCH = YES;
    7 
    8 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    9 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    10 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    11 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    12 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    13 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    14 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    15 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    16 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    17 
    18 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    19 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    20 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    21 
    22 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    23 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    24 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    25 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    26 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    27 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    287
    298GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/ThirdParty/gtest/xcode/Config/DebugProject.xcconfig

    r265315 r286958  
    1818DEPLOYMENT_POSTPROCESSING = NO
    1919
    20 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    21 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    22 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    23 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    24 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    25 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    26 
    2720// Dead code stripping off
    2821DEAD_CODE_STRIPPING = NO

  • trunk/Source/ThirdParty/gtest/xcode/Config/ReleaseProject.xcconfig

    r265315 r286958  
    2020DEPLOYMENT_POSTPROCESSING = YES
    2121
    22 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    23 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    24 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    25 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    26 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    27 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    28 
    2922// No symbols
    3023GCC_GENERATE_DEBUGGING_SYMBOLS = NO

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

    r277176 r286958  
    3030ONLY_ACTIVE_ARCH = YES;
    3131
    32 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    33 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    34 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    35 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    40 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    41 
    42 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    43 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    44 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    45 
    46 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    52 
    5332GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5433DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/WTF/ChangeLog

    r286917 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9        * wtf/PlatformHave.h: Add feature define which has been public since macOS 11.0
     10
    1112021-12-11  Don Olmstead  <don.olmstead@sony.com>
    212

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

    r275082 r286958  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    39 
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    41 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    42 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    43 
    44 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    46 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    47 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    48 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    49 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    50 
    5130GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5231DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/WTF/wtf/PlatformHave.h

    r286911 r286958  
    634634#endif
    635635
     636#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000) || PLATFORM(IOS)
     637#define HAVE_PASSKIT_NEW_BUTTON_TYPES 1
     638#endif
     639
    636640#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 150000)
    637641#define HAVE_PASSKIT_RECURRING_SUMMARY_ITEM 1

  • trunk/Source/WebCore/ChangeLog

    r286957 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7       
     8        Changes the deployment target for macOS 11 and above to use the default SDK version, instead
     9        of looking up a version using TARGET_MAC_OS_X_VERSION_MAJOR.
     10       
     11        Prior to macOS 11, the deployment target did NOT change between minor versions (e.g.
     12        "10.15" was the deployment target for all builds of 10.15.x). Now, minor releases may
     13        change the deployment target, so we cannot rely solely on the MAC_OS_X_VERSION_MAJOR to
     14        determine what deployment target to build for.
     15       
     16        Since the deployment target may change within different versions of a major release,
     17        TARGET_MAC_OS_X_VERSION_MAJOR is no longer useful for selecting a deployment target. It
     18        should be considered read-only. To build for a non-default macOS version, set the
     19        deployment target directly.
     20       
     21        Reverts changes made in https://commits.webkit.org/230363@main, now that Xcode has been
     22        fixed in rdar://problem/70185899.
     23
     24        * Configurations/DebugRelease.xcconfig:
     25        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     26        (WebCore::variationAxes): Removes a defensive unguarded-availability pragma, now that the
     27        underlying issue is fixed.
     28       
    1292021-12-13  Alan Bujtas  <zalan@apple.com>
    230

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

    r275082 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

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

    r275082 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/WebCore/PAL/pal/spi/cocoa/PassKitSPI.h

    r285898 r286958  
    457457    PKPaymentButtonTypeBook,
    458458    PKPaymentButtonTypeSubscribe,
     459    PKPaymentButtonTypeReload,
     460    PKPaymentButtonTypeAddMoney,
     461    PKPaymentButtonTypeTopUp,
     462    PKPaymentButtonTypeOrder,
     463    PKPaymentButtonTypeRent,
     464    PKPaymentButtonTypeSupport,
     465    PKPaymentButtonTypeContribute,
     466    PKPaymentButtonTypeTip,
    459467};
    460468#endif // !HAVE(PASSKIT_RECURRING_SUMMARY_ITEM)

  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r286634 r286958  
    306306    if (shouldLocalizeAxisNames == ShouldLocalizeAxisNames::Yes)
    307307        return adoptCF(CTFontCopyVariationAxes(font));
    308 #pragma clang diagnostic push
    309 #pragma clang diagnostic ignored "-Wunguarded-availability-new"
    310308    return adoptCF(CTFontCopyVariationAxesInternal(font));
    311 #pragma clang diagnostic pop
    312309#else
    313310    UNUSED_PARAM(shouldLocalizeAxisNames);

  • trunk/Source/WebGPU/ChangeLog

    r286896 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9
    1102021-12-10  Michael Saboff  <msaboff@apple.com>
    211

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

    r285480 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/WebInspectorUI/ChangeLog

    r286896 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9
    1102021-12-10  Michael Saboff  <msaboff@apple.com>
    211

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

    r275082 r286958  
    55
    66ONLY_ACTIVE_ARCH = YES;
    7 
    8 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    9 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    10 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    11 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    12 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    13 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    14 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    15 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    16 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    17 
    18 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    19 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    20 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    21 
    22 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    23 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    24 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    25 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    26 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    27 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    287
    298GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

  • trunk/Source/WebKit/ChangeLog

    r286947 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9
    1102021-12-13  Joonghun Park  <jh718.park@samsung.com>
    211

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

    r275082 r286958  
    2828
    2929ONLY_ACTIVE_ARCH = YES;
    30 
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    5130
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;

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

    r275082 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332DEBUG_INFORMATION_FORMAT = dwarf;

  • trunk/Source/bmalloc/ChangeLog

    r286934 r286958  
     12021-12-13  Elliott Williams  <emw@apple.com>
     2
     3        Deployment target for macOS 11+ does not follow minor version bumps
     4        https://bugs.webkit.org/show_bug.cgi?id=233906
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * Configurations/DebugRelease.xcconfig:
     9
    1102021-12-12  Zan Dobersek  <zdobersek@igalia.com>
    211

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

    r275082 r286958  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    39 
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    41 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    42 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    43 
    44 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    46 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    47 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    48 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    49 MACOSX_DEPLOYMENT_TARGET_130000 = 13.0;
    50 
    5130GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5231DEBUG_INFORMATION_FORMAT = dwarf;

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

    r268420 r286958  
    2626ONLY_ACTIVE_ARCH = YES;
    2727
    28 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    29 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    30 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    31 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    32 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    33 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    37 
    38 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    41 
    42 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    43 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    44 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    45 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    46 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    47 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    48 
    4928GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5029DEBUG_INFORMATION_FORMAT = dwarf;

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

    r268420 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 
    5231CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(USE_INTERNAL_SDK));
    5332CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);

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

    r268420 r286958  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    39 
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    41 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    42 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    43 
    44 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 
    5130SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    5231SDKROOT_ = macosx;

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

    r280166 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 
    5231GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5332

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

    r268371 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 
    5231WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
    5332

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

    r268371 r286958  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
    30 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    31 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    32 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    33 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    39 
    40 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    41 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    42 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    43 
    44 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    45 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    46 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    47 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    48 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    49 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    50 
    5130GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5231

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

    r268371 r286958  
    2929ONLY_ACTIVE_ARCH = YES;
    3030
    31 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    32 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    33 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    34 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    37 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    38 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    39 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    40 
    41 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    42 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    43 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    44 
    45 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    46 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    47 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    48 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    49 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    50 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    51 
    5231SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    5332SDKROOT_ = macosx;

  • trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

    r268420 r286958  
    2626ONLY_ACTIVE_ARCH = YES;
    2727
    28 // FIXME: Once <rdar://problem/70185899> is fixed, replace the following with
    29 // TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR)
    30 TARGET_MACOS_11_VERSION_MAJOR = $(TARGET_MACOS_11_VERSION_MAJOR_$(MAC_OS_X_VERSION_MAJOR))
    31 TARGET_MACOS_11_VERSION_MAJOR_110100 = 110000
    32 TARGET_MACOS_11_VERSION_MAJOR_110200 = 110000
    33 TARGET_MACOS_11_VERSION_MAJOR_110300 = 110000
    34 TARGET_MACOS_11_VERSION_MAJOR_110400 = 110000
    35 TARGET_MACOS_11_VERSION_MAJOR_110500 = 110000
    36 TARGET_MACOS_11_VERSION_MAJOR_110600 = 110000
    37 
    38 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR_$(TARGET_MACOS_11_VERSION_MAJOR))
    39 TARGET_MAC_OS_X_VERSION_MAJOR_110000 = 110000
    40 TARGET_MAC_OS_X_VERSION_MAJOR_ = $(MAC_OS_X_VERSION_MAJOR)
    41 
    42 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    43 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
    44 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
    45 MACOSX_DEPLOYMENT_TARGET_101500 = 10.15;
    46 MACOSX_DEPLOYMENT_TARGET_110000 = 11.0;
    47 MACOSX_DEPLOYMENT_TARGET_120000 = 12.0;
    48 
    4928GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
    5029DEBUG_INFORMATION_FORMAT = dwarf;
Note: See TracChangeset for help on using the changeset viewer.