Work around broken system version macro
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2020 16:08:44 +0000 (16:08 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Jun 2020 16:08:44 +0000 (16:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=212726

Reviewed by Dan Bernstein.

Source/bmalloc:

* Configurations/DebugRelease.xcconfig:

Source/JavaScriptCore:

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/DebugRelease.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/DebugRelease.xcconfig:

Source/WebCore:

* Configurations/DebugRelease.xcconfig:

Source/WebCore/PAL:

* Configurations/DebugRelease.xcconfig:

Source/WebInspectorUI:

* Configurations/DebugRelease.xcconfig:

Source/WebKit:

* Configurations/DebugRelease.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/DebugRelease.xcconfig:

Source/WTF:

* Configurations/DebugRelease.xcconfig:

Tools:

* ContentExtensionTester/Configurations/DebugRelease.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* ImageDiff/cg/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebEditingTester/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:

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

29 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Configurations/DebugRelease.xcconfig
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig
Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig
Source/WTF/ChangeLog
Source/WTF/Configurations/DebugRelease.xcconfig
Source/WebCore/ChangeLog
Source/WebCore/Configurations/DebugRelease.xcconfig
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/Configurations/DebugRelease.xcconfig
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
Source/WebKit/ChangeLog
Source/WebKit/Configurations/DebugRelease.xcconfig
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig
Source/bmalloc/ChangeLog
Source/bmalloc/Configurations/DebugRelease.xcconfig
Tools/ChangeLog
Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig
Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig
Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig
Tools/MiniBrowser/Configurations/DebugRelease.xcconfig
Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig
Tools/WebEditingTester/Configurations/DebugRelease.xcconfig
Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig

index 2878506..25eeb64 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index fb8ed90..ed72af5 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 8c97179..efef341 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-02  Keith Rollin  <krollin@apple.com>
 
         Change ANGLE's header postprocessing script to not rely on timestamps
index 9818797..9f21e61 100644 (file)
@@ -5,7 +5,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 338da37..a56ff68 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-02  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, reverting r262290.
index f0e7254..eef8ebc 100644 (file)
@@ -6,7 +6,13 @@ VALID_ARCHS[sdk=watch*] = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index cc011cf..3afe59a 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index 7147017..a881c98 100644 (file)
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 206dbdd..c873ffb 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index 26126d6..76f9e60 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index ab7402f..1c0fdca 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index 64bfae9..2523f9b 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 73d5f88..d7ef560 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-01  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: Graphics: should use the `id` (name) of the animation if it exists
index ca09337..ea3c5b9 100644 (file)
@@ -5,7 +5,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 8dff535..6ade64d 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index e018c80..fea5b2c 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 86592d7..728abe8 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index b92253a..0eb1920 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 967adad..9bd7263 100644 (file)
@@ -1,3 +1,12 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig:
+
 2020-06-02  Mark Lam  <mark.lam@apple.com>
 
         Change Gigacage::Config to use storage in WebConfig::g_config instead of its own.
index 7147017..a881c98 100644 (file)
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 6a3e3bc..5e95c98 100644 (file)
@@ -1,3 +1,19 @@
+2020-06-04  Tim Horton  <timothy_horton@apple.com>
+
+        Work around broken system version macro
+        https://bugs.webkit.org/show_bug.cgi?id=212726
+
+        Reviewed by Dan Bernstein.
+
+        * ContentExtensionTester/Configurations/DebugRelease.xcconfig:
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * WebEditingTester/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+        * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
+
 2020-06-04  Andy Estes  <aestes@apple.com>
 
         [watchOS] Re-enable content filtering in the simulator build
index 3f4754e..34610f0 100644 (file)
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 739da9f..f6a6f59 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index f3e11b4..a33d0ab 100644 (file)
@@ -27,7 +27,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;
index 6687b1c..87e131c 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index 928af16..73fb86b 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index 2f168a6..63d1973 100644 (file)
@@ -27,7 +27,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index 9e14cf2..e257c45 100644 (file)
@@ -28,7 +28,13 @@ ARCHS = $(ARCHS_STANDARD_32_64_BIT);
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
 MACOSX_DEPLOYMENT_TARGET_101300 = 10.13;
index d02bca0..8ef4f7a 100644 (file)
 
 ONLY_ACTIVE_ARCH = YES;
 
-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND = $(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_$(MAC_OS_X_VERSION_MAJOR));
+WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND_10160 = YES;
+WK_MAC_OS_X_VERSION = $(WK_MAC_OS_X_VERSION_$(WK_NEED_MAC_OS_X_VERSION_MAJOR_WORKAROUND));
+WK_MAC_OS_X_VERSION_ = $(WK_MAC_OS_X_VERSION_NO);
+WK_MAC_OS_X_VERSION_NO = $(MAC_OS_X_VERSION_MAJOR);
+WK_MAC_OS_X_VERSION_YES = 101600;
+TARGET_MAC_OS_X_VERSION_MAJOR = $(WK_MAC_OS_X_VERSION);
 
 MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
 MACOSX_DEPLOYMENT_TARGET_macosx_101300 = 10.13;