Changeset 232665 in webkit


Ignore:
Timestamp:
Jun 9, 2018 10:18:08 PM (6 years ago)
Author:
mitz@apple.com
Message:

[Xcode] Clean up and modernize some build setting definitions
​https://bugs.webkit.org/show_bug.cgi?id=186463

Reviewed by Sam Weinig.

Source/bmalloc:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11. Simplified the definition of WK_PRIVATE_FRAMEWORK_STUBS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
  • Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
  • Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • Configurations/Version.xcconfig: Removed definition for macOS 10.11.
  • Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.

Source/ThirdParty/libwebrtc:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/Version.xcconfig: Removed definitions for macOS 10.10 and 10.11, and added definitions for later versions.
  • Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
  • Configurations/opus.xcconfig: Simplified the definition of SSE4_FLAG now that macOS 10.12 is the earliest supported version.

Source/WebCore:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • Configurations/Version.xcconfig: Removed definition for macOS 10.11.
  • Configurations/WebCore.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
  • Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.

Source/WebCore/PAL:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • Configurations/PAL.xcconfig: Removed WK_PRIVATE_FRAMEWORKS_DIR, because the private framework stubs aren’t used when linking PAL.
  • Configurations/Version.xcconfig: Removed definition for macOS 10.11.
  • Configurations/WebKitTargetConditionals.xcconfig: Ditto.

Source/WebInspectorUI:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/Version.xcconfig: Ditto.

Source/WebKit:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/BaseTarget.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
  • Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
  • Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • Configurations/Version.xcconfig: Removed definition for macOS 10.11.
  • Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.

Source/WebKitLegacy/mac:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.
  • Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • Configurations/Version.xcconfig: Removed definition for macOS 10.11.
  • Configurations/WebKitLegacy.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
  • Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.

Source/WTF:

  • Configurations/Base.xcconfig: Removed definition for macOS 10.11.
  • Configurations/DebugRelease.xcconfig: Ditto.

Tools:

  • DumpRenderTree/mac/Configurations/Base.xcconfig: Removed definition for macOS 10.11. Simplified the definition of WK_PRIVATE_FRAMEWORK_STUBS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
  • MiniBrowser/Configurations/Base.xcconfig: Ditto.
  • MiniBrowser/Configurations/DebugRelease.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/Base.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/DebugRelease.xcconfig: Ditto.
  • TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
  • TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
  • WebKitTestRunner/Configurations/Base.xcconfig: Ditto. Also simplified the definition of WK_PRIVATE_FRAMEWORK_STUBS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
Location:
trunk
Files:
64 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11. Simplified the
     9          definition of WK_PRIVATE_FRAMEWORK_STUBS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS
     10          is true for all supported Xcode versions.
     11        * Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
     12        * Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and
     13          ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
     14        * Configurations/Version.xcconfig: Removed definition for macOS 10.11.
     15        * Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
     16
    1172018-06-09  Dan Bernstein  <mitz@apple.com>
    218

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

    r232069 r232665  
    9696
    9797TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    98 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9998TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    10099TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    … …  
    107106SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
    108107
    109 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    110 WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
    111 WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
     108WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
     109WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
    112110
    113111FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);

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

    r232526 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    3938SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4039SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r232304 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10
    1112018-05-30  David Kilzer  <ddkilzer@apple.com>
    212

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

    r232069 r232665  
    5656
    5757TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    58 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    5958TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    6059TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

  • trunk/Source/ThirdParty/libwebrtc/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/Version.xcconfig: Removed definitions for macOS 10.10 and 10.11, and added
     11          definitions for later versions.
     12        * Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
     13        * Configurations/opus.xcconfig: Simplified the definition of SSE4_FLAG now that macOS 10.12
     14          is the earliest supported version.
     15
    1162018-06-09  Dan Bernstein  <mitz@apple.com>
    217

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

    r232644 r232665  
    5757
    5858TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    59 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6059TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    6160TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
    39 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    4038SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4139SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
     40SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
     41SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
    4242
    4343// The production build always uses the full version with a system version prefix.

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

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

    r229567 r232665  
    2121EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    2222
    23 // El Capitan and iossimulator can't use SSE4 intrinsics, but Sierra and newer can.
    24 EXCLUDED_SOURCE_FILE_NAMES_macosx_101100 = NSQ_sse.c VAD_sse.c VQ_WMat_EC_sse.c NSQ_del_dec_sse.c;
    25 SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG$(WK_MACOS_1012));
    26 SSE4_FLAG_MACOS_SINCE_1012 = OPUS_X86_MAY_HAVE_SSE4_1;
     23// The iOS Simulator can't use SSE4 intrinsics, but macOS can.
     24SSE4_FLAG[sdk=macosx*] = OPUS_X86_MAY_HAVE_SSE4_1;

  • trunk/Source/WTF/ChangeLog

    r232660 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10
    1112018-06-08  Darin Adler  <darin@apple.com>
    212

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

    r232069 r232665  
    9797
    9898TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    99 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    10099TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    101100TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    3030
    3131MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    32 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3332MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

  • trunk/Source/WebCore/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and
     11          ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
     12        * Configurations/Version.xcconfig: Removed definition for macOS 10.11.
     13        * Configurations/WebCore.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR
     14          now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
     15        * Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
     16
    1172018-06-09  Dan Bernstein  <mitz@apple.com>
    218

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

    r232069 r232665  
    8585
    8686TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    87 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8887TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    8988TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    3938SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4039SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

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

    r232239 r232665  
    2828GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) BUILDING_WEBKIT U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 GL_SILENCE_DEPRECATION=1 GLES_SILENCE_DEPRECATION=1 $(inherited);
    2929
    30 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    3130WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
    32 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
    33 WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
     31WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    3432
    3533FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

  • trunk/Source/WebCore/PAL/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and
     11          ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
     12        * Configurations/PAL.xcconfig: Removed WK_PRIVATE_FRAMEWORKS_DIR, because the private
     13          framework stubs aren’t used when linking PAL.
     14        * Configurations/Version.xcconfig: Removed definition for macOS 10.11.
     15        * Configurations/WebKitTargetConditionals.xcconfig: Ditto.
     16
    1172018-06-09  Dan Bernstein  <mitz@apple.com>
    218

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

    r232069 r232665  
    8585
    8686TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    87 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8887TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    8988TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r232526 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r232239 r232665  
    2727GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
    2828
    29 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    30 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
    31 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
    32 WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    33 
    3429FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
    35 FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
     30FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR);
    3631FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
    3732FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    3938SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4039SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

  • trunk/Source/WebInspectorUI/ChangeLog

    r232524 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/Version.xcconfig: Ditto.
     11
    1122018-06-05  Matt Baker  <mattbaker@apple.com>
    213

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

    r232069 r232665  
    6363
    6464TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    65 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6665TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    6766TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    88
    99MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    10 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    1110MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    1211MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232627 r232665  
    99SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    1010SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    11 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    1211SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    1312SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

  • trunk/Source/WebKit/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/BaseTarget.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR
     10          now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
     11        * Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
     12        * Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and
     13          ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
     14        * Configurations/Version.xcconfig: Removed definition for macOS 10.11.
     15        * Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
     16
    1172018-06-09  Dan Bernstein  <mitz@apple.com>
    218

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

    r232321 r232665  
    8585
    8686TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    87 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8887TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    8988TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    … …  
    117116
    118117SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
    119 
    120 FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
    121118
    122119OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);

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

    r232239 r232665  
    2525#include "Version.xcconfig"
    2626
    27 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    2827WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
    29 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
    30 WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
     28WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    3129
    3230FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"

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

    r232492 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    3938SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4039SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r232660 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10        * Configurations/FeatureDefines.xcconfig: Simplified the definitions of ENABLE_APPLE_PAY and
     11          ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest supported version.
     12        * Configurations/Version.xcconfig: Removed definition for macOS 10.11.
     13        * Configurations/WebKitLegacy.xcconfig: Simplified the definition of WK_PRIVATE_FRAMEWORKS_DIR
     14          now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
     15        * Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for macOS 10.11.
     16
    1172018-06-08  Darin Adler  <darin@apple.com>
    218

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

    r232069 r232665  
    8686
    8787TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    88 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8988TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    9089TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r232526 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r232627 r232665  
    3636SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
    3737SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    38 SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
    3938SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
    4039SYSTEM_VERSION_PREFIX_macosx_101300 = 13;

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

    r232239 r232665  
    3434EXPORTED_SYMBOLS_FILE_[arch=x86_64] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
    3535
    36 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    3736WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
    38 WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
    39 WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
     37WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    4038
    4139FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

  • trunk/Source/bmalloc/ChangeLog

    r232626 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9        * Configurations/DebugRelease.xcconfig: Ditto.
     10
    1112018-06-07  Darin Adler  <darin@apple.com>
    212

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

    r232626 r232665  
    9494
    9595TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    96 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9796TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    9897TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    3030
    3131MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    32 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3332MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

  • trunk/Tools/ChangeLog

    r232664 r232665  
     12018-06-09  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up and modernize some build setting definitions
     4        https://bugs.webkit.org/show_bug.cgi?id=186463
     5
     6        Reviewed by Sam Weinig.
     7
     8        * DumpRenderTree/mac/Configurations/Base.xcconfig: Removed definition for macOS 10.11.
     9          Simplified the definition of WK_PRIVATE_FRAMEWORK_STUBS_DIR now that
     10          WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all supported Xcode versions.
     11        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: Removed definition for macOS
     12          10.11.
     13        * MiniBrowser/Configurations/Base.xcconfig: Ditto.
     14        * MiniBrowser/Configurations/DebugRelease.xcconfig: Ditto.
     15        * TestWebKitAPI/Configurations/Base.xcconfig: Ditto.
     16        * TestWebKitAPI/Configurations/DebugRelease.xcconfig: Ditto.
     17        * TestWebKitAPI/Configurations/FeatureDefines.xcconfig: Simplified the definitions of
     18          ENABLE_APPLE_PAY and ENABLE_VIDEO_PRESENTATION_MODE now macOS 10.12 is the earliest
     19          supported version.
     20        * TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig: Removed definitions for
     21          macOS 10.11.
     22        * WebKitTestRunner/Configurations/Base.xcconfig: Ditto. Also simplified the definition of
     23          WK_PRIVATE_FRAMEWORK_STUBS_DIR now that WK_XCODE_SUPPORTS_TEXT_BASED_STUBS is true for all
     24          supported Xcode versions
     25        * WebKitTestRunner/Configurations/DebugRelease.xcconfig: Removed definition for macOS 10.11.
     26
    1272018-06-09  Dan Bernstein  <mitz@apple.com>
    228

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

    r232069 r232665  
    3434
    3535WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
    36 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    37 WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
    38 WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
     36WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
     37WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    3938
    4039FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
    … …  
    8887
    8988TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    90 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    9189TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    9290TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    33 MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;

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

    r232069 r232665  
    6868
    6969TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    70 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    7170TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    7271TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r227156 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;

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

    r232239 r232665  
    7979
    8080TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    81 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    8281TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    8382TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;

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

    r232526 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;

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

    r232659 r232665  
    4444ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
    4545ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
    46 ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
    47 ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
     46ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
    4847
    4948ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
    … …  
    339338ENABLE_VIDEO = ENABLE_VIDEO;
    340339
    341 ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
    342 ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
    343 ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    344 ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    345 ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
    346 ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    347 ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
    348 ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
    349 ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
    350 ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
     340ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
    351341
    352342ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;

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

    r229567 r232665  
    4949// macOS
    5050
    51 WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    52 WK_MACOS_BEFORE_1012_101100 = YES;
    53 
    5451WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    55 WK_MACOS_BEFORE_1013_101100 = YES;
    5652WK_MACOS_BEFORE_1013_101200 = YES;
    5753
    5854WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    59 WK_MACOS_BEFORE_1014_101100 = YES;
    6055WK_MACOS_BEFORE_1014_101200 = YES;
    6156WK_MACOS_BEFORE_1014_101300 = YES;
    6257
    6358WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    64 WK_MACOS_BEFORE_1015_101100 = YES;
    6559WK_MACOS_BEFORE_1015_101200 = YES;
    6660WK_MACOS_BEFORE_1015_101300 = YES;
    6761WK_MACOS_BEFORE_1015_101400 = YES;
    68 
    69 WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
    70 WK_MACOS_1012_ = _MACOS_SINCE_1012;
    71 WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
    72 
    73 WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
    74 WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
    75 WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
    76 
    77 WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
    78 WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
    79 WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
    80 
    81 WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
    82 WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
    83 WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
    8462
    8563WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));

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

    r232069 r232665  
    6262
    6363TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
    64 TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
    6564TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
    6665TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    … …  
    8887
    8988WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
    90 WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
    91 WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
    92 WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
     89WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
     90WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
    9391
    9492FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;

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

    r227156 r232665  
    3131
    3232MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    33 MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
    3433MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
    3534MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
Note: See TracChangeset for help on using the changeset viewer.