Title: [286896] trunk/Source
Revision
286896
Author
msab...@apple.com
Date
2021-12-10 18:32:03 -0800 (Fri, 10 Dec 2021)

Log Message

https://bugs.webkit.org/show_bug.cgi?id=234173
Update Install Paths for build system changes

Reviewed by Yusuke Suzuki.

Updated install paths for changes in the build system that use a system path prefix.

Source/_javascript_Core:

* Configurations/Base.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/ANGLE-dynamic.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/libwebrtc.xcconfig:

Source/WebCore:

Covered by existing tests.

* Configurations/WebCore.xcconfig:

Source/WebGPU:

* Configurations/WebGPU.xcconfig:

Source/WebInspectorUI:

* Configurations/WebInspectorUIFramework.xcconfig:

Source/WebKit:

* Configurations/BaseTarget.xcconfig:
* Configurations/WebKit.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/WebKitLegacy.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (286895 => 286896)


--- trunk/Source/_javascript_Core/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/_javascript_Core/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/Base.xcconfig:
+
 2021-12-10  Mikhail R. Gadelha  <mikh...@igalia.com>
 
         [JSC][32bit] Add callee save registers for MIPS

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (286895 => 286896)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -163,6 +163,8 @@
 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_OVERRIDE_FRAMEWORKS_DIR_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)/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/ThirdParty/ANGLE/ChangeLog (286895 => 286896)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/ANGLE-dynamic.xcconfig:
+
 2021-12-09  Dean Jackson  <d...@apple.com>
 
         [ANGLE] Code generation happens on each build and produces SCM diffs

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (286895 => 286896)


--- trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -14,8 +14,11 @@
 ANGLE_OTHER_LDFLAGS_maccatalyst = -framework IOKit -lz;
 ANGLE_OTHER_LDFLAGS_macosx = -framework IOKit -lz;
 
-INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
-INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 INSTALL_PATH_USE_ALTERNATE_FRAMEWORKS_DIR_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (286895 => 286896)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/libwebrtc.xcconfig:
+
 2021-12-09  Alex Christensen  <achristen...@webkit.org>
 
         Prepare for transition to C++20

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (286895 => 286896)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -31,8 +31,11 @@
 EXPORTED_SYMBOLS_FILE[sdk=iphoneos*] = Configurations/libwebrtc.iOS.exp;
 EXPORTED_SYMBOLS_FILE[sdk=iphonesimulator*] = Configurations/libwebrtc.iOSsim.exp;
 
-INSTALL_PATH = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
-INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Frameworks;
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 

Modified: trunk/Source/WebCore/ChangeLog (286895 => 286896)


--- trunk/Source/WebCore/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebCore/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,16 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        Covered by existing tests.
+
+        * Configurations/WebCore.xcconfig:
+
 2021-12-10  Alexey Shvayka  <ashva...@apple.com>
 
         Some WebIDL operations / attributes incorrectly use _current_ realm instead of _relevant_

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (286895 => 286896)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -148,8 +148,12 @@
 WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
 WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
-NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=iphone*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES[sdk=macosx*] = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO);
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
 
 PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
 PRODUCTION_FRAMEWORKS_DIR_COCOA_TOUCH_YES = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);

Modified: trunk/Source/WebGPU/ChangeLog (286895 => 286896)


--- trunk/Source/WebGPU/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebGPU/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/WebGPU.xcconfig:
+
 2021-12-07  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [WebGPU] Fix MacCatalyst build

Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (286895 => 286896)


--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -27,7 +27,11 @@
 
 INFOPLIST_FILE = Info.plist;
 
-INSTALL_PATH = $(WEBGPU_FRAMEWORKS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(WEBGPU_FRAMEWORKS_DIR);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(WEBGPU_FRAMEWORKS_DIR);
+
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);

Modified: trunk/Source/WebInspectorUI/ChangeLog (286895 => 286896)


--- trunk/Source/WebInspectorUI/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebInspectorUI/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/WebInspectorUIFramework.xcconfig:
+
 2021-12-10  Razvan Caliman  <rcali...@apple.com>
 
         Web Inspector: Add CSS variable names to property name completion list

Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (286895 => 286896)


--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -5,9 +5,13 @@
 FRAMEWORK_VERSION = A;
 
 INFOPLIST_FILE = Info.plist
-INSTALL_PATH = $(INSTALL_PATH_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
-INSTALL_PATH_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+INSTALL_PATH_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 PRODUCT_NAME = WebInspectorUI;
 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);

Modified: trunk/Source/WebKit/ChangeLog (286895 => 286896)


--- trunk/Source/WebKit/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebKit/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,15 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/BaseTarget.xcconfig:
+        * Configurations/WebKit.xcconfig:
+
 2021-12-10  Devin Rousso  <drou...@apple.com>
 
         WKWebView doesn’t respond to -copyFont: and -pasteFont:

Modified: trunk/Source/WebKit/Configurations/BaseTarget.xcconfig (286895 => 286896)


--- trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebKit/Configurations/BaseTarget.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -66,7 +66,10 @@
 
 NORMAL_WEBKIT_FRAMEWORKS_DIR = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
 
-WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/Frameworks;
+WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO);
+WEBKIT_FRAMEWORKS_DIR_USE_SYSTEM_CONTENT_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
 WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 

Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (286895 => 286896)


--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -33,7 +33,11 @@
 MODULEMAP_FILE_cocoatouch = Modules/iOS.modulemap;
 MODULEMAP_FILE_ = Modules/OSX.modulemap;
 
-INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(WEBKIT_FRAMEWORKS_DIR);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+
 DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (286895 => 286896)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2021-12-11 02:32:03 UTC (rev 286896)
@@ -1,3 +1,14 @@
+2021-12-10  Michael Saboff  <msab...@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=234173
+        Update Install Paths for build system changes
+
+        Reviewed by Yusuke Suzuki.
+
+        Updated install paths for changes in the build system that use a system path prefix.
+
+        * Configurations/WebKitLegacy.xcconfig:
+
 2021-12-10  Devin Rousso  <drou...@apple.com>
 
         Allow `Pasteboard::readBuffer` to read from the pasteboard as a whole instead of a specific item

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (286895 => 286896)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2021-12-11 02:26:37 UTC (rev 286895)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2021-12-11 02:32:03 UTC (rev 286896)
@@ -61,7 +61,10 @@
 
 HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
 INFOPLIST_FILE = mac/Info.plist;
-INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
+INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(WEBKIT_LEGACY_FRAMEWORKS_DIR);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
+INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
 INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 INSTALL_PATH_COCOA_TOUCH_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to