Diff
Modified: branches/safari-614.1.10-branch/Source/_javascript_Core/ChangeLog (293101 => 293102)
--- branches/safari-614.1.10-branch/Source/_javascript_Core/ChangeLog 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Source/_javascript_Core/ChangeLog 2022-04-20 17:09:14 UTC (rev 293102)
@@ -1,3 +1,48 @@
+2022-04-20 Russell Epstein <[email protected]>
+
+ Cherry-pick r293043. rdar://problem/91910145
+
+ Various WebKit tools need to be told about the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239516
+
+ Reviewed by Ryan Haddad.
+
+ Source/_javascript_Core:
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for TestAPI and the JSC tools.
+ This will contain the system content path prefix when enabled.
+
+ * Configurations/TestAPI.xcconfig:
+ * Configurations/ToolExecutable.xcconfig:
+
+ Tools:
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for the webkit test tools.
+ This will contain the system content path prefix when enabled.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+ * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-19 Michael Saboff <[email protected]>
+
+ Various WebKit tools need to be told about the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239516
+
+ Reviewed by Ryan Haddad.
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for TestAPI and the JSC tools.
+ This will contain the system content path prefix when enabled.
+
+ * Configurations/TestAPI.xcconfig:
+ * Configurations/ToolExecutable.xcconfig:
+
2022-04-08 Elliott Williams <[email protected]>
[Xcode] Avoid targeting 32-bit iOS and Mac architectures
Modified: branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/TestAPI.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/TestAPI.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/TestAPI.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -24,7 +24,7 @@
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
#include "Version.xcconfig"
-INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR);
PRODUCT_NAME = $(TARGET_NAME);
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
Modified: branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -24,7 +24,7 @@
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
#include "Version.xcconfig"
-INSTALL_PATH = $(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR);
PRODUCT_NAME = $(TARGET_NAME);
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
Modified: branches/safari-614.1.10-branch/Tools/ChangeLog (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/ChangeLog 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/ChangeLog 2022-04-20 17:09:14 UTC (rev 293102)
@@ -1,3 +1,52 @@
+2022-04-20 Russell Epstein <[email protected]>
+
+ Cherry-pick r293043. rdar://problem/91910145
+
+ Various WebKit tools need to be told about the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239516
+
+ Reviewed by Ryan Haddad.
+
+ Source/_javascript_Core:
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for TestAPI and the JSC tools.
+ This will contain the system content path prefix when enabled.
+
+ * Configurations/TestAPI.xcconfig:
+ * Configurations/ToolExecutable.xcconfig:
+
+ Tools:
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for the webkit test tools.
+ This will contain the system content path prefix when enabled.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+ * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-04-19 Michael Saboff <[email protected]>
+
+ Various WebKit tools need to be told about the system content path
+ https://bugs.webkit.org/show_bug.cgi?id=239516
+
+ Reviewed by Ryan Haddad.
+
+ Added the INSTALL_PATH_PREFIX to the INSTALL_PATH for the webkit test tools.
+ This will contain the system content path prefix when enabled.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+ * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig:
+
2022-04-08 Elliott Williams <[email protected]>
[Xcode] Avoid targeting 32-bit iOS and Mac architectures
Modified: branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -29,6 +29,9 @@
USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+
WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // e.g. iOS 9.3 => 9
WK_TARGET_TVOS_VERSION_MAJOR = $(TVOS_DEPLOYMENT_TARGET:base);
WK_TARGET_WATCHOS_VERSION_MAJOR = $(WATCHOS_DEPLOYMENT_TARGET:base);
Modified: branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -37,7 +37,7 @@
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
INSTALL_PATH_Release = $(INSTALL_PATH);
INSTALL_PATH_Debug = $(INSTALL_PATH);
-INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
+INSTALL_PATH_Production = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
INSTALL_PATH_engineering = $(INSTALL_PATH);
CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = mac/Configurations/DumpRenderTree.entitlements;
Modified: branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -34,5 +34,5 @@
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
INSTALL_PATH_Release = $(INSTALL_PATH);
INSTALL_PATH_Debug = $(INSTALL_PATH);
-INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
+INSTALL_PATH_Production = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
INSTALL_PATH_engineering = $(INSTALL_PATH);
Modified: branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -37,5 +37,5 @@
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
INSTALL_PATH_Release = $(USER_LIBRARY_DIR)/Plugins;
INSTALL_PATH_Debug = $(USER_LIBRARY_DIR)/Plugins;
-INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
+INSTALL_PATH_Production = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
INSTALL_PATH_engineering = $(USER_LIBRARY_DIR)/Plugins;
Modified: branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -29,6 +29,9 @@
USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+
CLANG_CXX_LANGUAGE_STANDARD = c++2a;
CLANG_CXX_LIBRARY = libc++;
CLANG_ENABLE_OBJC_WEAK = YES;
Modified: branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (293101 => 293102)
--- branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2022-04-20 17:08:59 UTC (rev 293101)
+++ branches/safari-614.1.10-branch/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2022-04-20 17:09:14 UTC (rev 293102)
@@ -24,4 +24,4 @@
WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework;
WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources;
-INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
