Diff
Modified: branches/safari-614.1.5-branch/Source/_javascript_Core/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/_javascript_Core/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/_javascript_Core/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/Base.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/_javascript_Core/Configurations/Base.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -34,8 +34,10 @@
INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/ThirdParty/ANGLE/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/ANGLE-dynamic.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -18,8 +18,10 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
STAGED_DYLIB_FRAMEWORK_PATH=/WebCore.framework/Versions/A/Frameworks
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/ThirdParty/libwebrtc/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/libwebrtc.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -35,8 +35,10 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
STAGED_DYLIB_FRAMEWORK_PATH=/WebCore.framework/Versions/A/Frameworks
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/WebCore/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebCore/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebCore/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/WebCore.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/WebCore/Configurations/WebCore.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -59,8 +59,10 @@
INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/WebGPU/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebGPU/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/WebGPU.xcconfig:
+
2022-03-07 Russell Epstein <[email protected]>
Cherry-pick r290960. rdar://problem/89920518
Modified: branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -32,8 +32,10 @@
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(WEBGPU_FRAMEWORKS_DIR);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/WebInspectorUI/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebInspectorUI/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebInspectorUI/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/WebInspectorUIFramework.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -13,8 +13,10 @@
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/WebKit/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebKit/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebKit/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/Base.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/WebKit/Configurations/Base.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebKit/Configurations/Base.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebKit/Configurations/Base.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -32,8 +32,10 @@
INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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.5-branch/Source/WebKitLegacy/mac/ChangeLog (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebKitLegacy/mac/ChangeLog 2022-03-11 21:55:29 UTC (rev 291188)
@@ -1,3 +1,60 @@
+2022-03-11 Russell Epstein <[email protected]>
+
+ Cherry-pick r291139. rdar://problem/90127039
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ 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@291139 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-10 Michael Saboff <[email protected]>
+
+ Catalyst _javascript_Core, WebCore, WebKitLegacy, and WebKit shouldn't be copied to the Secondary Path
+ https://bugs.webkit.org/show_bug.cgi?id=237748
+
+ Reviewed by Mark Lam.
+
+ Updated the configuration to exclude copying Catalyst build products to the secondary path.
+
+ * Configurations/Base.xcconfig:
+
2022-03-03 Russell Epstein <[email protected]>
Cherry-pick r290805. rdar://problem/89053248
Modified: branches/safari-614.1.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (291187 => 291188)
--- branches/safari-614.1.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-03-11 21:52:38 UTC (rev 291187)
+++ branches/safari-614.1.5-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-03-11 21:55:29 UTC (rev 291188)
@@ -34,8 +34,10 @@
INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = NO
-COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH[sdk=macos*] = $(USE_SYSTEM_CONTENT_PATH)
+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;
