[Xcode] Clean up and modernize some build setting definitions
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Jun 2018 05:18:08 +0000 (05:18 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Jun 2018 05:18:08 +0000 (05:18 +0000)
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.

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

64 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/Base.xcconfig
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
Source/JavaScriptCore/Configurations/Version.xcconfig
Source/JavaScriptCore/Configurations/WebKitTargetConditionals.xcconfig
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/Base.xcconfig
Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig
Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
Source/ThirdParty/libwebrtc/Configurations/WebKitTargetConditionals.xcconfig
Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/Base.xcconfig
Source/WTF/Configurations/DebugRelease.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/Base.xcconfig
Source/WebCore/Configurations/DebugRelease.xcconfig
Source/WebCore/Configurations/FeatureDefines.xcconfig
Source/WebCore/Configurations/Version.xcconfig
Source/WebCore/Configurations/WebCore.xcconfig
Source/WebCore/Configurations/WebKitTargetConditionals.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/Base.xcconfig
Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig
Source/WebCore/PAL/Configurations/PAL.xcconfig
Source/WebCore/PAL/Configurations/Version.xcconfig
Source/WebCore/PAL/Configurations/WebKitTargetConditionals.xcconfig
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Configurations/Base.xcconfig
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
Source/WebInspectorUI/Configurations/Version.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/Configurations/Base.xcconfig
Source/WebKit/Configurations/BaseTarget.xcconfig
Source/WebKit/Configurations/DebugRelease.xcconfig
Source/WebKit/Configurations/FeatureDefines.xcconfig
Source/WebKit/Configurations/Version.xcconfig
Source/WebKit/Configurations/WebKitTargetConditionals.xcconfig
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/Base.xcconfig
Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig
Source/WebKitLegacy/mac/Configurations/Version.xcconfig
Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKitLegacy/mac/Configurations/WebKitTargetConditionals.xcconfig
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/Base.xcconfig
Source/bmalloc/Configurations/DebugRelease.xcconfig
Tools/ChangeLog
Tools/DumpRenderTree/mac/Configurations/Base.xcconfig
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
Tools/MiniBrowser/Configurations/Base.xcconfig
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Configurations/Base.xcconfig
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig
Tools/TestWebKitAPI/Configurations/WebKitTargetConditionals.xcconfig
Tools/WebKitTestRunner/Configurations/Base.xcconfig
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

index 7e9ba85..5dd36cf 100644 (file)
@@ -1,5 +1,21 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * JavaScriptCore.xcodeproj/project.pbxproj:
index d11c7d4..7f418c6 100644 (file)
@@ -95,7 +95,6 @@ WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wfo
 HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
@@ -106,9 +105,8 @@ CODE_SIGN_IDENTITY = -;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
 
 FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
 
index 8c928da..ef5fb0a 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index 3af1398..a7c7f41 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 5fde12f..ddfc05f 100644 (file)
@@ -1,3 +1,13 @@
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
+        * Configurations/DebugRelease.xcconfig: Ditto.
+
 2018-05-30  David Kilzer  <ddkilzer@apple.com>
 
         ANGLE: Fix clang static analyzer issues in GetExecutablePath() and GetExecutableDirectory()
index 0f6d6ed..8bf72f2 100644 (file)
@@ -55,7 +55,6 @@ WARNING_CFLAGS = -Wglobal-constructors -Wno-newline-eof -Wno-inconsistent-missin
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 2bff3ae..f0ff2cc 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index a94e454..9465542 100644 (file)
@@ -1,5 +1,20 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * libwebrtc.xcodeproj/project.pbxproj:
index ee2b318..6528955 100644 (file)
@@ -56,7 +56,6 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
 VALID_ARCHS = $(ARCHS_STANDARD_64_BIT);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index d87a95e..5df1074 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index 4d9e2e1..a7c7f41 100644 (file)
@@ -35,10 +35,10 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
+SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
+SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
 
 // The production build always uses the full version with a system version prefix.
 BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 8f0f8b7..b910177 100644 (file)
@@ -20,7 +20,5 @@ GCC_PREPROCESSOR_DEFINITIONS[arch=x86_64] = $(inherited) $(SSE4_FLAG);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *_sse.c *_sse2.c;
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 
-// El Capitan and iossimulator can't use SSE4 intrinsics, but Sierra and newer can.
-EXCLUDED_SOURCE_FILE_NAMES_macosx_101100 = NSQ_sse.c VAD_sse.c VQ_WMat_EC_sse.c NSQ_del_dec_sse.c;
-SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG$(WK_MACOS_1012));
-SSE4_FLAG_MACOS_SINCE_1012 = OPUS_X86_MAY_HAVE_SSE4_1;
+// The iOS Simulator can't use SSE4 intrinsics, but macOS can.
+SSE4_FLAG[sdk=macosx*] = OPUS_X86_MAY_HAVE_SSE4_1;
index bcc873c..b92d071 100644 (file)
@@ -1,3 +1,13 @@
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
+        * Configurations/DebugRelease.xcconfig: Ditto.
+
 2018-06-08  Darin Adler  <darin@apple.com>
 
         [Cocoa] Remove all uses of NSAutoreleasePool as part of preparation for ARC
index a7bf793..8dfd59e 100644 (file)
@@ -96,7 +96,6 @@ SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/incl
 LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index f9a9ffa..e41c019 100644 (file)
@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index 3389de9..907247a 100644 (file)
@@ -1,5 +1,21 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * WebCore.xcodeproj/project.pbxproj:
index 412ac21..ab8c881 100644 (file)
@@ -84,7 +84,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index ae1d1e6..8f1c773 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index d5489d9..3caf779 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index 8eb91d9..29b6806 100644 (file)
 GCC_PREFIX_HEADER = WebCorePrefix.h;
 GCC_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);
 
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
 FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 99ecd27..362ad5c 100644 (file)
@@ -1,5 +1,21 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * PAL.xcodeproj/project.pbxproj:
index 5826fd0..51b5ab0 100644 (file)
@@ -84,7 +84,6 @@ GCC_WARN_UNUSED_VARIABLE = YES;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 9b5ae45..6067c6f 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index 7b19144..95fa0cc 100644 (file)
 
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
 
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
-
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR);
 FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
 FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
 
index 050aecd..ba74131 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 1845678..97bb0f1 100644 (file)
@@ -1,3 +1,14 @@
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
+        * Configurations/DebugRelease.xcconfig: Ditto.
+        * Configurations/Version.xcconfig: Ditto.
+
 2018-06-05  Matt Baker  <mattbaker@apple.com>
 
         Web Inspector: Tab picker is briefly visible when TabBar initially shown
index 850c617..8b39633 100644 (file)
@@ -62,7 +62,6 @@ ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 404b5d2..a702183 100644 (file)
@@ -7,7 +7,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index 841b9ef..7130698 100644 (file)
@@ -8,7 +8,6 @@ FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index ba2355c..65b995c 100644 (file)
@@ -1,5 +1,21 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * WebKit.xcodeproj/project.pbxproj:
index dc35c33..d884176 100644 (file)
@@ -84,7 +84,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
@@ -117,8 +116,6 @@ CODE_SIGN_IDENTITY = -;
 
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
-FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
-
 OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
 OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;
 OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
index 0b91c17..09b4e09 100644 (file)
 #include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
 
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
index e7ca1d4..83744a0 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index 6295ed2..2ffbc31 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 2e58374..4205ea3 100644 (file)
@@ -1,3 +1,19 @@
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
 2018-06-08  Darin Adler  <darin@apple.com>
 
         [Cocoa] Remove all uses of NSAutoreleasePool as part of preparation for ARC
index 0a8e2d4..0221022 100644 (file)
@@ -85,7 +85,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 439c116..6e0c723 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index d5489d9..3caf779 100644 (file)
@@ -35,7 +35,6 @@ SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
 // The system version prefix is based on the current system version.
 SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
 SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
 SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
 SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
 SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
index a1a076e..993fac5 100644 (file)
@@ -33,10 +33,8 @@ EXPORTED_SYMBOLS_FILE_cocoatouch = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLe
 EXPORTED_SYMBOLS_FILE_[arch=i386] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.i386.exp;
 EXPORTED_SYMBOLS_FILE_[arch=x86_64] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
 
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
 WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
-WK_PRIVATE_FRAMEWORKS_DIR_iphone_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
 FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_YES = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 15f402c..8b6caf2 100644 (file)
@@ -1,3 +1,13 @@
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * Configurations/Base.xcconfig: Removed definition for macOS 10.11.
+        * Configurations/DebugRelease.xcconfig: Ditto.
+
 2018-06-07  Darin Adler  <darin@apple.com>
 
         [Cocoa] Turn on ARC for the single Objective-C++ source file in bmalloc
index f6a3bb6..252f083 100644 (file)
@@ -93,7 +93,6 @@ PREBINDING = NO;
 WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index f9a9ffa..e41c019 100644 (file)
@@ -29,7 +29,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index 8803747..fdef299 100644 (file)
@@ -1,5 +1,31 @@
 2018-06-09  Dan Bernstein  <mitz@apple.com>
 
+        [Xcode] Clean up and modernize some build setting definitions
+        https://bugs.webkit.org/show_bug.cgi?id=186463
+
+        Reviewed by Sam Weinig.
+
+        * 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.
+
+2018-06-09  Dan Bernstein  <mitz@apple.com>
+
         Added missing file references to the Configuration group.
 
         * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
index 7f6e9cd..4854ec7 100644 (file)
@@ -33,9 +33,8 @@ WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
 
@@ -87,7 +86,6 @@ DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 1879d63..83c91f5 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_macosx_101400 = 10.14;
index 4e07566..b9854db 100644 (file)
@@ -67,7 +67,6 @@ GCC_NO_COMMON_BLOCKS = YES;
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 90d1724..9a4d6d8 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
index d6a8442..e536c1a 100644 (file)
@@ -78,7 +78,6 @@ DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
index 37d1df6..1e777ab 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;
index e34c142..2bbb6dc 100644 (file)
@@ -43,8 +43,7 @@ ENABLE_ACCELERATED_OVERFLOW_SCROLLING_cocoatouch = ENABLE_ACCELERATED_OVERFLOW_S
 ENABLE_APPLE_PAY = $(ENABLE_APPLE_PAY_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_iphoneos = ENABLE_APPLE_PAY;
 ENABLE_APPLE_PAY_iphonesimulator = ENABLE_APPLE_PAY;
-ENABLE_APPLE_PAY_macosx = $(ENABLE_APPLE_PAY$(WK_MACOS_1012));
-ENABLE_APPLE_PAY_MACOS_SINCE_1012 = ENABLE_APPLE_PAY;
+ENABLE_APPLE_PAY_macosx = ENABLE_APPLE_PAY;
 
 ENABLE_APPLE_PAY_SESSION_V3 = $(ENABLE_APPLE_PAY_SESSION_V3_$(WK_PLATFORM_NAME));
 ENABLE_APPLE_PAY_SESSION_V3_iphoneos = ENABLE_APPLE_PAY_SESSION_V3;
@@ -338,16 +337,7 @@ ENABLE_VARIATION_FONTS_MACOS_SINCE_1013 = ENABLE_VARIATION_FONTS;
 
 ENABLE_VIDEO = ENABLE_VIDEO;
 
-ENABLE_VIDEO_PRESENTATION_MODE = $(ENABLE_VIDEO_PRESENTATION_MODE_$(WK_PLATFORM_NAME));
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphoneminimalsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_iphonesimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_watchsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvos = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_appletvsimulator = ENABLE_VIDEO_PRESENTATION_MODE;
-ENABLE_VIDEO_PRESENTATION_MODE_macosx = $(ENABLE_VIDEO_PRESENTATION_MODE$(WK_MACOS_1012));
-ENABLE_VIDEO_PRESENTATION_MODE_MACOS_SINCE_1012 = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE = ENABLE_VIDEO_PRESENTATION_MODE;
 
 ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
 
index 6111fed..adfb975 100644 (file)
 
 // macOS
 
-WK_MACOS_BEFORE_1012 = $(WK_MACOS_BEFORE_1012_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1012_101100 = YES;
-
 WK_MACOS_BEFORE_1013 = $(WK_MACOS_BEFORE_1013_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1013_101100 = YES;
 WK_MACOS_BEFORE_1013_101200 = YES;
 
 WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1014_101100 = YES;
 WK_MACOS_BEFORE_1014_101200 = YES;
 WK_MACOS_BEFORE_1014_101300 = YES;
 
 WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-WK_MACOS_BEFORE_1015_101100 = YES;
 WK_MACOS_BEFORE_1015_101200 = YES;
 WK_MACOS_BEFORE_1015_101300 = YES;
 WK_MACOS_BEFORE_1015_101400 = YES;
 
-WK_MACOS_1012 = $(WK_MACOS_1012_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_ = _MACOS_SINCE_1012;
-WK_MACOS_1012_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1013 = $(WK_MACOS_1012_1013_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1013_ = $(WK_MACOS_1013);
-WK_MACOS_1012_1013_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1014 = $(WK_MACOS_1012_1014_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1014_ = $(WK_MACOS_1014);
-WK_MACOS_1012_1014_YES = _MACOS_BEFORE_1012;
-
-WK_MACOS_1012_1015 = $(WK_MACOS_1012_1015_$(WK_MACOS_BEFORE_1012));
-WK_MACOS_1012_1015_ = $(WK_MACOS_1015);
-WK_MACOS_1012_1015_YES = _MACOS_BEFORE_1012;
-
 WK_MACOS_1013 = $(WK_MACOS_1013_$(WK_MACOS_BEFORE_1013));
 WK_MACOS_1013_ = _MACOS_SINCE_1013;
 WK_MACOS_1013_YES = _MACOS_BEFORE_1013;
index 019f129..6efeda7 100644 (file)
@@ -61,7 +61,6 @@ DEBUG_DEFINES_normal = NDEBUG;
 DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
 
 TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
-TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
 TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
 TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
 TARGET_MAC_OS_X_VERSION_MAJOR_14 = 101400;
@@ -87,9 +86,8 @@ WK_NOT_ = YES;
 WK_NOT_YES = NO;
 
 WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
-WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphone*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphone_ = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
 
 FRAMEWORK_SEARCH_PATHS[sdk=mac*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
 FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(inherited) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR);
index 74a5eb9..d602670 100644 (file)
@@ -30,7 +30,6 @@ ONLY_ACTIVE_ARCH = YES;
 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
 MACOSX_DEPLOYMENT_TARGET_101400 = 10.14;