Diff
Modified: branches/safari-614.1.8-branch/Source/_javascript_Core/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/_javascript_Core/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/_javascript_Core/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/Base.xcconfig:
+
2022-03-26 Yusuke Suzuki <ysuz...@apple.com>
Use static_assert instead of COMPILE_ASSERT
Modified: branches/safari-614.1.8-branch/Source/_javascript_Core/Configurations/Base.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -37,7 +37,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
ALWAYS_SEARCH_USER_PATHS = NO;
Modified: branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2022-03-23 Kenneth Russell <k...@chromium.org>
Roll ANGLE to 2022-03-22 (e7f29440f02514126f30350dcd7132b68f7954d7)
Modified: branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -21,7 +21,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
Modified: branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/libwebrtc.xcconfig:
+
2022-03-22 David Quesada <david_ques...@apple.com>
REGRESSION(r291455): libwebrtc has the wrong install name when using override frameworks directory
Modified: branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -38,7 +38,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
Modified: branches/safari-614.1.8-branch/Source/WebCore/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebCore/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebCore/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/WebCore.xcconfig:
+
2022-03-31 Russell Epstein <repst...@apple.com>
Cherry-pick r291978. rdar://problem/90497026
Modified: branches/safari-614.1.8-branch/Source/WebCore/Configurations/WebCore.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -73,7 +73,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_$(WK_COCOA_TOUCH));
INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
Modified: branches/safari-614.1.8-branch/Source/WebGPU/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebGPU/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebGPU/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/WebGPU.xcconfig:
+
2022-03-25 Myles C. Maxfield <mmaxfi...@apple.com>
[WebGPU] Remove default: from switch statements, in favor of exhaustively listing all cases
Modified: branches/safari-614.1.8-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -35,7 +35,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
Modified: branches/safari-614.1.8-branch/Source/WebInspectorUI/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebInspectorUI/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebInspectorUI/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
2022-03-23 Razvan Caliman <rcali...@apple.com>
Web Inspector: Styles panel: Unwanted extra dash when autocompleting CSS variable names
Modified: branches/safari-614.1.8-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -16,7 +16,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
PRODUCT_NAME = WebInspectorUI;
Modified: branches/safari-614.1.8-branch/Source/WebKit/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebKit/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebKit/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/Base.xcconfig:
+
2022-03-29 Russell Epstein <repst...@apple.com>
Cherry-pick r292042. rdar://problem/90999175
Modified: branches/safari-614.1.8-branch/Source/WebKit/Configurations/Base.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebKit/Configurations/Base.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebKit/Configurations/Base.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -35,7 +35,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
ALWAYS_SEARCH_USER_PATHS = NO;
Modified: branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/ChangeLog (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/ChangeLog 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/ChangeLog 2022-04-04 17:49:22 UTC (rev 292301)
@@ -1,3 +1,64 @@
+2022-04-04 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r292258. rdar://problem/91069927
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ Source/_javascript_Core:
+
+ * Configurations/Base.xcconfig:
+
+ Source/ThirdParty/ANGLE:
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
+ Source/ThirdParty/libwebrtc:
+
+ * Configurations/libwebrtc.xcconfig:
+
+ Source/WebCore:
+
+ * Configurations/WebCore.xcconfig:
+
+ Source/WebGPU:
+
+ * Configurations/WebGPU.xcconfig:
+
+ Source/WebInspectorUI:
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/Base.xcconfig:
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/Base.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292258 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-01 Michael Saboff <msab...@apple.com>
+
+ Stop copying StagedFrameworks to the secondary path by default
+ https://bugs.webkit.org/show_bug.cgi?id=238688
+
+ Reviewed by Saam Barati.
+
+ Decoupled COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH from USE_SYSTEM_CONTENT_PATH so we won't
+ always copy frameworks to the secondary path on macOS. Instead, the build configuration can set
+ COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH as appropriate.
+
+ * Configurations/Base.xcconfig:
+
2022-03-31 Russell Epstein <repst...@apple.com>
Cherry-pick r291978. rdar://problem/90497026
Modified: branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (292300 => 292301)
--- branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-04-04 17:46:40 UTC (rev 292300)
+++ branches/safari-614.1.8-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-04-04 17:49:22 UTC (rev 292301)
@@ -37,7 +37,6 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_macos = $(USE_SYSTEM_CONTENT_PATH)
ALWAYS_SEARCH_USER_PATHS = NO;
