[webkit-changes] [294767] trunk/Source

Tue, 24 May 2022 14:50:20 -0700

Title: [294767] trunk/Source
Revision
294767
Author
[email protected]
Date
2022-05-24 14:49:41 -0700 (Tue, 24 May 2022)

Log Message

WK_ALTERNATE_FRAMEWORKS_DIR should not affect WK_OVERRIDE_FRAMEWORKS_DIR
https://bugs.webkit.org/show_bug.cgi?id=240831

Reviewed by Tim Horton.

Resolve an inconsistency among projects regarding whether
WK_OVERRIDE_FRAMEWORKS_DIR is set for Mac Catalyst. Catalyst builds work
by setting WK_ALTERNATE_FRAMEWORKS_DIR. With this change, we update
projects so that an alternates directory never affects
WK_OVERRIDE_FRAMEWORKS_DIR.

This brings _javascript_Core and WebGPU in
line with build settings logic in ANGLE, libwebrtc, PAL, WebCore,
WebInspectorUI, WebKitLegacy, and WebKit. Some of these projects were
changed to have these semantics years ago in <https://commits.webkit.org/r230958>.

Separating WK_ALTERNATE_FRAMEWORKS_DIR from WK_OVERRIDE_FRAMEWORKS_DIR
is valuable for distinguishing between system-installed Mac Catalyst
WebKit and self-contained WebKit builds such as STP.

* Source/_javascript_Core/Configurations/Base.xcconfig:
* Source/WebGPU/Configurations/Base.xcconfig:

Canonical link: https://commits.webkit.org/250932@main

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (294766 => 294767)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-24 21:37:22 UTC (rev 294766)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2022-05-24 21:49:41 UTC (rev 294767)
@@ -139,8 +139,10 @@
 NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 _javascript_CORE_FRAMEWORKS_DIR = $(_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 _javascript_CORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
+_javascript_CORE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)$(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
 
 _javascript_CORE_CONTENTS_DIR[sdk=iphone*] = _javascript_Core.framework;
 _javascript_CORE_CONTENTS_DIR[sdk=macosx*] = _javascript_Core.framework/Versions/A;
@@ -167,10 +169,7 @@
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/System/Library/Frameworks;
 
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";

Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (294766 => 294767)


--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-24 21:37:22 UTC (rev 294766)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-05-24 21:49:41 UTC (rev 294767)
@@ -67,16 +67,15 @@
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
 
 WEBGPU_FRAMEWORKS_DIR = $(WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
+WEBGPU_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 
 WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
 
 WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_ = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO);
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-WK_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/System/Library/PrivateFrameworks;
 
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to