Attachment 349081 Details for Bug 189362 – Patch (Does not work)

[patch] Patch (Does not work)

bug-189362-20180906151353.patch (text/plain), 8.40 KB, created by Daniel Bates on 2018-09-06 15:13:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-09-06 15:13:54 PDT

Size: 8.40 KB

patch

obsolete

>Subversion Revision: 235759
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c3a379fa3d282ac05b4073f809d4d7ee54324d97..392e267f26bdceec7a86283cb44de0e0fe0d4dce 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Add $(BUILT_PRODUCTS_DIR) to SYSTEM_FRAMEWORK_SEARCH_PATHS
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR) as system frameworks so that Xcode does not treat
>+        compile time warnings as errors when one built framework includes headers from another built framework
>+        and the included headers cause compile-time warnings.
>+
>+        * Configurations/WebCore.xcconfig:
>+
> 2018-09-06  Antti Koivisto  <antti@apple.com>
> 
>         Actively prewarm processes created for prewarm pool
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 4012e5eb4c3729de15db30ea93c0dca3dd2bd6a4..dd2a90f6c853c264fb930a5d9101b2c60ac54a68 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Add $(BUILT_PRODUCTS_DIR) to SYSTEM_FRAMEWORK_SEARCH_PATHS
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR) as system frameworks so that Xcode does not treat
>+        compile time warnings as errors when one built framework includes headers from another built framework
>+        and the included headers cause compile-time warnings.
>+
>+        * Configurations/PAL.xcconfig:
>+
> 2018-09-04  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, attempt to fix an internal build after r235585.
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 2c967078fdb865816e3676c64f484e19a614119b..d5bba36ae3c7198bfe2950138059b53bab0bfec2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Add $(BUILT_PRODUCTS_DIR) to SYSTEM_FRAMEWORK_SEARCH_PATHS
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR) as system frameworks so that Xcode does not treat
>+        compile time warnings as errors when one built framework includes headers from another built framework
>+        and the included headers cause compile-time warnings.
>+
>+        * Configurations/BaseTarget.xcconfig:
>+
> 2018-09-06  Antti Koivisto  <antti@apple.com>
> 
>         Actively prewarm processes created for prewarm pool
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index c6e27ea0e32d7981d61723b4690e689b0ac05818..e49004a5786eb1c786ef2efbba2d11ac975133fe 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-09-06  Daniel Bates  <dabates@apple.com>
>+
>+        [Xcode] Add $(BUILT_PRODUCTS_DIR) to SYSTEM_FRAMEWORK_SEARCH_PATHS
>+        https://bugs.webkit.org/show_bug.cgi?id=189362
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Treat frameworks built into $(BUILT_PRODUCTS_DIR) as system frameworks so that Xcode does not treat
>+        compile time warnings as errors when one built framework includes headers from another built framework
>+        and the included headers cause compile-time warnings.
>+
>+        * Configurations/WebKitLegacy.xcconfig:
>+
> 2018-09-06  Frederic Wang  <fwang@igalia.com>
> 
>         Group options of scrollRectToVisible into a struct
>diff --git a/Source/WebCore/Configurations/WebCore.xcconfig b/Source/WebCore/Configurations/WebCore.xcconfig
>index a0befd4fdf5463e9975164d77516ee38322ec007..436fd449f175bfe75a52b4a730f8a22e2e18caf8 100644
>--- a/Source/WebCore/Configurations/WebCore.xcconfig
>+++ b/Source/WebCore/Configurations/WebCore.xcconfig
>@@ -35,7 +35,7 @@ FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks
> 
> LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_LIBWEBRTC_LIBRARY_DIR)";
> ADDITIONAL_CFLAGS = -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks;
>diff --git a/Source/WebCore/PAL/Configurations/PAL.xcconfig b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>index 95fa0ccfc41831f800a1fba057005d251c971821..250f6fd71105d389451ee34e0fa8e026a8146695 100644
>--- a/Source/WebCore/PAL/Configurations/PAL.xcconfig
>+++ b/Source/WebCore/PAL/Configurations/PAL.xcconfig
>@@ -31,7 +31,7 @@ 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);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 405d63bbb012a39e65da8ba8b8908358a258bd6c..cac9c9dd8c6d519fd13e3fef2ccd7e90cc0bca73 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -31,7 +31,7 @@ FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> GCC_PREFIX_HEADER = WebKit2Prefix.h;
> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) $(WK_CORE_PREDICTION_DEFINES) U_HIDE_DEPRECATED_API U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 FRAMEWORK_NAME=WebKit;
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 993fac544d20a510fa40fc2dc36cb0cbbce3f584..8c7103e7c453c6ac58840089e897b76ed08185b5 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -42,7 +42,7 @@ FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS
> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
> FRAMEWORK_SEARCH_PATHS_COCOA_TOUCH_NO = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)";
> 
>-SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
>+SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
> OTHER_CFLAGS = $(OTHER_CFLAGS_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> OTHER_CFLAGS_COCOA_TOUCH_YES = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System.framework/PrivateHeaders;

Actions: View | Formatted Diff | Diff

Attachments on bug 189362: 349047 | 349081