Diff
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -108,8 +108,17 @@
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled;
-HEADER_SEARCH_PATHS = . "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = . "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(HEADER_SEARCH_PATHS);
+LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -34,7 +34,7 @@
OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_BASE) -framework CoreServices $(PROFILE_GENERATE_OR_USE_LDFLAGS);
WTF_ARCHIVE = $(BUILT_PRODUCTS_DIR)/libWTF.a;
-WTF_ARCHIVE[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/lib/libWTF.a;
+WTF_ARCHIVE[config=Production] = $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_INSTALL_PATH)/libWTF.a;
SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/_javascript_Core.order;
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/DerivedSources.make (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/DerivedSources.make 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/DerivedSources.make 2022-05-18 22:00:43 UTC (rev 294439)
@@ -48,7 +48,8 @@
FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
-PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
+PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH))
+
PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2022-05-18 22:00:43 UTC (rev 294439)
@@ -12111,9 +12111,9 @@
inputFileListPaths = (
);
inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
+ "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
"$(SRCROOT)/../../Tools/Profiling/Empty.profdata",
- "$(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
+ "$(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed",
);
name = "Copy Profiling Data";
outputFileListPaths = (
@@ -12123,7 +12123,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"usr/local/include/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n
exit 1;\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/_javascript_Core.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/_javascript_Core.profdata -a lzfse;\nfi\n";
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"${WK_LIBRARY_HEADERS_FOLDER_PATH}/WebKitAdditions/Profiling/_javascript_Core.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\&quo
t;;\n exit 1;\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/_javascript_Core.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core/_javascript_Core.profdata -a lzfse;\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Scripts/generate-unified-sources.sh (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2022-05-18 22:00:43 UTC (rev 294439)
@@ -8,9 +8,9 @@
if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
fi
fi
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/config.rb (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/config.rb 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/config.rb 2022-05-18 22:00:43 UTC (rev 294439)
@@ -22,12 +22,13 @@
# THE POSSIBILITY OF SUCH DAMAGE.
buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
+headersFolderPath = ENV['WK_LIBRARY_HEADERS_FOLDER_PATH'];
if buildProductsDirectory and File.exists?(buildProductsDirectory)
- $: << "#{buildProductsDirectory}/usr/local/include/WebKitAdditions/Scripts"
+ $: << "#{buildProductsDirectory}#{headersFolderPath}/WebKitAdditions/Scripts"
end
sdkRootDirectory = ENV['SDKROOT'];
if sdkRootDirectory and File.exists?(sdkRootDirectory)
- $: << "#{sdkRootDirectory}/usr/local/include/WebKitAdditions/Scripts"
+ $: << "#{sdkRootDirectory}#{headersFolderPath}/WebKitAdditions/Scripts"
end
Modified: branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/parser.rb (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/parser.rb 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/_javascript_Core/offlineasm/parser.rb 2022-05-18 22:00:43 UTC (rev 294439)
@@ -267,6 +267,7 @@
# FIXME: CMake does not currently set BUILT_PRODUCTS_DIR.
# https://bugs.webkit.org/show_bug.cgi?id=229340
@buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR'];
+ @headersFolderPath = ENV['WK_LIBRARY_HEADERS_FOLDER_PATH'];
@options = options
@sources = sources
end
@@ -836,7 +837,7 @@
if @options[:webkit_additions_path]
additionsDirectoryName = @options[:webkit_additions_path]
else
- additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
+ additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/WebKitAdditions/"
end
fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
if not File.exists?(fileName)
@@ -872,7 +873,7 @@
if @options[:webkit_additions_path]
additionsDirectoryName = @options[:webkit_additions_path]
else
- additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/"
+ additionsDirectoryName = "#{@buildProductsDirectory}#{@headersFolderPath}/WebKitAdditions/"
end
fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName
if not File.exists?(fileName)
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/ANGLE-dynamic.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -38,7 +38,7 @@
HEADER_SEARCH_PATHS = ${DERIVED_FILES_DIR} include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google ${DERIVED_FILES_DIR};
-ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
+ANGLE_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/ANGLE;
PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_HEADERS_FOLDER_PATH);
PUBLIC_HEADERS_FOLDER_PATH[sdk=macosx*] = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_PLATFORM_NAME));
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/AngleMetalLib.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -6,7 +6,7 @@
HEADER_SEARCH_PATHS = include src src/common/third_party/numerics third_party/base src/common/third_party/base third_party/zlib/google;
-ANGLE_HEADERS_FOLDER_PATH = /usr/local/include/ANGLE;
+ANGLE_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/ANGLE;
PUBLIC_HEADERS_FOLDER_PATH = $(ANGLE_HEADERS_FOLDER_PATH);
PUBLIC_HEADERS_FOLDER_PATH[sdk=macosx*] = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_PLATFORM_NAME));
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -100,6 +100,13 @@
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
ANGLE_INSTALL_PATH_PREFIX = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -130,6 +130,13 @@
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -11,8 +11,8 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
HEADER_SEARCH_PATHS = Source/third_party/boringssl/src/include;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH)/libwebrtc;
USE_HEADERMAP = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libabsl.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -28,5 +28,5 @@
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PUBLIC_HEADERS_FOLDER_PATH = $(PUBLIC_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PUBLIC_HEADERS_FOLDER_PATH_not_legacy = $(INSTALL_PATH_PREFIX)/usr/local/include/absl;
-PUBLIC_HEADERS_FOLDER_PATH_legacy = /usr/local/include/absl_flattened;
+PUBLIC_HEADERS_FOLDER_PATH_not_legacy = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/absl;
+PUBLIC_HEADERS_FOLDER_PATH_legacy = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/absl_flattened;
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -11,8 +11,8 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
HEADER_SEARCH_PATHS = Source/third_party/libsrtp/include Source/third_party/libsrtp/config Source/third_party/boringssl/src/include Source/third_party/libsrtp Source/third_party/libsrtp/crypto/include;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
GCC_PREPROCESSOR_DEFINITIONS = V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 PACKAGE_STRING="\"libsrtp2 2.0.0-pre\"" PACKAGE_VERSION="\"2.0.0-pre\"" HAVE_CONFIG_H OPENSSL HAVE_STDLIB_H HAVE_STRING_H HAVE_STDINT_H HAVE_INTTYPES_H HAVE_INT16_T HAVE_INT32_T HAVE_INT8_T HAVE_UINT16_T HAVE_UINT32_T HAVE_UINT64_T HAVE_UINT8_T HAVE_ARPA_INET
_H HAVE_NETINET_IN_H HAVE_SYS_TYPES_H HAVE_UNISTD_H GCM $(inherited);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -13,8 +13,8 @@
HEADER_SEARCH_PATHS[arch=x86_64] = Source/third_party/libvpx/source/config/mac/x64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
HEADER_SEARCH_PATHS[arch=arm64*] = Source/third_party/libvpx/source/config/ios/arm64 Source/third_party/libvpx/source/libvpx Source/third_party/libvpx/source/config;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*] = $(inherited) WEBRTC_WEBKIT_DISABLE_HARDWARE_ACCELERATION;
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -10,8 +10,8 @@
HEADER_SEARCH_PATHS = Source/third_party/libwebm Source/third_party/libwebm/webm_parser Source/third_party/libwebm/webm_parser/include;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/webm;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webm;
USE_HEADERMAP = NO;
OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -54,13 +54,13 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
HEADER_SEARCH_PATHS = Source Source/third_party/libsrtp/crypto/include Source/third_party/libsrtp/include Source/third_party/boringssl/src/include Source/third_party/libyuv/include Source/third_party/usrsctp Source/third_party/usrsctp/usrsctplib Source/third_party/usrsctp/usrsctplib/usrsctplib Source/webrtc/sdk/objc/Framework/Headers Source/webrtc/common_audio/signal_processing/include Source/webrtc/modules/audio_coding/codecs/isac/main/include Source/third_party/opus/src/celt Source/third_party/opus/src/include Source/third_party/opus/src/src Source/webrtc/modules/audio_device/mac Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet Source/webrtc/modules/audio_device/ios Source/webrtc Source/webrtc/sdk/objc Source/webrtc/sdk/objc/base Source/webrtc/sdk/objc/Framework/Classes Source/third_party/libsrtp/config Source/webrtc/sdk/objc/Framework/Classes/Common Source/webrtc/sdk/objc/Framework/Classes/Video Source/webrtc/sdk/objc/Framework/Classes/PeerConnecti
on Source/third_party/abseil-cpp Source/third_party/libvpx/source/libvpx Source/third_party/libwebm/webm_parser/include;
-PUBLIC_HEADERS_FOLDER_PREFIX = /usr/local/include;
+PUBLIC_HEADERS_FOLDER_PREFIX = $(WK_LIBRARY_HEADERS_FOLDER_PATH);
INSTALL_PUBLIC_HEADER_PREFIX = $(INSTALL_PATH_PREFIX)$(PUBLIC_HEADERS_FOLDER_PREFIX);
SYSTEM_PUBLIC_HEADER_PREFIX = $(SYSTEM_PUBLIC_HEADER_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
SYSTEM_PUBLIC_HEADER_PREFIX_YES = $(DSTROOT)$(PUBLIC_HEADERS_FOLDER_PREFIX);
HEADER_FOLDER_LIST = absl libwebrtc webm webrtc;
-PUBLIC_LIBRARY_FOLDER_PREFIX = /usr/local/lib;
+PUBLIC_LIBRARY_FOLDER_PREFIX = $(WK_LIBRARY_INSTALL_PATH);
INSTALL_PUBLIC_LIBRARY_PREFIX = $(INSTALL_PATH_PREFIX)$(PUBLIC_LIBRARY_FOLDER_PREFIX);
SYSTEM_PUBLIC_LIBRARY_PREFIX = $(SYSTEM_PUBLIC_LIBRARY_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
SYSTEM_PUBLIC_LIBRARY_PREFIX_YES = $(DSTROOT)$(PUBLIC_LIBRARY_FOLDER_PREFIX);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -11,8 +11,8 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
HEADER_SEARCH_PATHS = Source/third_party/libyuv/include;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -13,8 +13,8 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
HEADER_SEARCH_PATHS = Source/third_party/opus/src/include Source/third_party/opus/src/celt Source/third_party/opus/src/silk Source/third_party/opus/src/silk/float Source/third_party/opus/src;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
WARNING_CFLAGS = -Wno-incompatible-pointer-types $(inherited)
GCC_PREPROCESSOR_DEFINITIONS = VAR_ARRAYS OPUS_BUILD OPUS_EXPORT= HAVE_LRINT HAVE_LRINTF $(inherited);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -11,8 +11,8 @@
INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH);
HEADER_SEARCH_PATHS = Source/ Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/ Source/third_party/usrsctp/usrsctplib/usrsctplib/ Source/third_party/boringssl/src/include/;
-INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
-PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
WARNING_CFLAGS = -Wno-deprecated-declarations $(inherited);
GCC_PREPROCESSOR_DEFINITIONS = SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin $(inherited);
Modified: branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -26,7 +26,7 @@
HEADER_SEARCH_PATHS = Source/third_party/yasm;
SKIP_INSTALL = YES;
-PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libwebrtc;
+PUBLIC_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/libwebrtc;
USE_HEADERMAP = NO;
WARNING_CFLAGS = -Wno-shorten-64-to-32 -Wno-conditional-uninitialized -Wno-implicit-function-declaration -Wno-strict-prototypes;
Modified: branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -99,9 +99,9 @@
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wconditional-uninitialized -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wvla -Wliteral-conversion -Wthread-safety;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(DSTROOT)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
-SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/include $(inherited);
-LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)/usr/local/lib $(inherited);
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(DSTROOT)$(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
TARGET_MACOS_LEGACY_VERSION_IDENTIFIER = $(TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_$(MACOSX_DEPLOYMENT_TARGET:base))
TARGET_MACOS_LEGACY_VERSION_IDENTIFIER_10 = 10$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier)
@@ -166,6 +166,18 @@
WK_USER_LTO_MODE_ = $(WK_DEFAULT_LTO_MODE);
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_thin);
+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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
WTF_INSTALL_PATH_PREFIX = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
WTF_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
Modified: branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/WTF.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/WTF.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/WTF.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/lib;
+INSTALL_PATH = $(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
PRODUCT_NAME = WTF;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -36,11 +36,11 @@
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PRIVATE_HEADERS_FOLDER_PATH_legacy = $(WTF_INSTALL_PATH_PREFIX)/usr/local/include/wtf_flattened;
-PRIVATE_HEADERS_FOLDER_PATH_not_legacy = $(WTF_INSTALL_PATH_PREFIX)/usr/local/include/wtf;
+PRIVATE_HEADERS_FOLDER_PATH_legacy = $(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf_flattened;
+PRIVATE_HEADERS_FOLDER_PATH_not_legacy = $(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf;
ICU_HEADERS_FOLDER_PATH = $(ICU_HEADERS_FOLDER_PATH_$(DEPLOYMENT_LOCATION));
-ICU_HEADERS_FOLDER_PATH_NO = $(BUILT_PRODUCTS_DIR)/usr/local/include/unicode;
-ICU_HEADERS_FOLDER_PATH_YES = $(WTF_INSTALL_PATH_PREFIX)/usr/local/include/unicode;
+ICU_HEADERS_FOLDER_PATH_NO = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/unicode;
+ICU_HEADERS_FOLDER_PATH_YES = $(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/unicode;
SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks
Modified: branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/icu.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/icu.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WTF/Configurations/icu.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -27,4 +27,4 @@
EXCLUDED_SOURCE_FILE_NAMES = $(inherited) $(EXCLUDED_SOURCE_FILE_NAMES_$(USE_INTERNAL_SDK));
EXCLUDED_SOURCE_FILE_NAMES_YES = *;
-PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)/usr/local/include/unicode;
+PRIVATE_HEADERS_FOLDER_PATH = $(WTF_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/unicode;
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -141,11 +141,26 @@
WK_IS_COCOA_TOUCH = $(WK_NOT_$(WK_EMPTY_$(WK_COCOA_TOUCH)));
EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a libWTF.a
-WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions
+WK_WEBKITADDITIONS_INSTALL_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions
WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH)
WK_WEBCORE_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-input.xcfilelist
WK_WEBCORE_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebCore/DerivedSources-output.xcfilelist
+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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+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)";
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCore.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCore.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -67,11 +67,14 @@
LIBRARY_SEARCH_PATHS = $(inherited) "$(WK_FRAMEWORKS_LIBRARY_DIR)";
-WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
-ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/ $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/;
-LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc/sdk/objc/Framework/Headers $(SDKROOT)/usr/local/include/webrtc/sdk/objc/Framework/Headers;
+WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
+ANGLE_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/ $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/;
+LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc/sdk/objc/Framework/Headers $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc/sdk/objc/Framework/Headers;
-HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
+HEADER_SEARCH_PATHS = PAL ForwardingHeaders /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(ANGLE_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+LIBRARY_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_INSTALL_PATH) $(inherited);
+
INFOPLIST_FILE = Info.plist;
INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
@@ -209,9 +212,9 @@
WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
_javascript_CORE_PRIVATE_HEADERS_DIR = $(_javascript_CORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
@@ -223,14 +226,6 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png npapi.h npfunctions.h npruntime.h npruntime_internal.h;
-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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-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)";
-
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -28,15 +28,15 @@
PRIVATE_HEADERS_FOLDER_PATH_Debug = WebCoreTestSupport;
PRIVATE_HEADERS_FOLDER_PATH_Release = $(PRIVATE_HEADERS_FOLDER_PATH_Debug);
PRIVATE_HEADERS_FOLDER_PATH_Production = $(PRIVATE_HEADERS_FOLDER_PATH_Production_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-PRIVATE_HEADERS_FOLDER_PATH_Production_NO = /usr/local/include/WebCoreTestSupport;
-PRIVATE_HEADERS_FOLDER_PATH_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Production_NO = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebCoreTestSupport;
INSTALL_PATH = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
// Using [sdk=macosx*] to override the setting in WebCore.xcconfig.
INSTALL_PATH[sdk=macosx*] = $(INSTALL_PATH_WebCoreTestSupport_$(CONFIGURATION));
INSTALL_PATH_WebCoreTestSupport_Production = $(INSTALL_PATH_WebCoreTestSupport_Production_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
-INSTALL_PATH_WebCoreTestSupport_Production_NO = /usr/local/lib;
-INSTALL_PATH_WebCoreTestSupport_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/lib;
+INSTALL_PATH_WebCoreTestSupport_Production_NO = $(WK_LIBRARY_INSTALL_PATH);
+INSTALL_PATH_WebCoreTestSupport_Production_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_INSTALL_PATH);
SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
SKIP_INSTALL_ = YES;
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/DerivedSources.make (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/DerivedSources.make 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/DerivedSources.make 2022-05-18 22:00:43 UTC (rev 294439)
@@ -50,7 +50,7 @@
FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
-PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
+PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH))
PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebCore)/DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
@@ -1548,8 +1548,8 @@
IDL_PATHS := $(sort $(foreach IDL_FILE, $(JS_BINDING_IDLS), $(realpath $(dir $(IDL_FILE)))))
ADDITIONS_PATHS = \
- $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions \
- $(SDKROOT)/usr/local/include/WebKitAdditions
+ $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions \
+ $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions
ADDITIONAL_BINDING_IDLS_PATHS = \
$(ADDITIONS_PATHS) \
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -136,13 +136,6 @@
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
-WK_WHICH_BUILD_SYSTEM = not_
-WK_WHICH_BUILD_SYSTEM = $(inherited)legacy
-WK_USE_NEW_BUILD_SYSTEM = $(WK_USE_NEW_BUILD_SYSTEM_$(WK_WHICH_BUILD_SYSTEM))
-WK_USE_NEW_BUILD_SYSTEM_legacy = NO
-WK_USE_NEW_BUILD_SYSTEM_not_legacy = YES
-
-
WK_XCODE_SUPPORTS_LTO = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_10_2_$(XCODE_VERSION_MAJOR)));
WK_XCODE_SUPPORTS_LTO[arch=arm*] = $(WK_NOT_$(WK_XCODE_VERSION_BEFORE_11_4_$(XCODE_VERSION_MAJOR)));
@@ -173,3 +166,19 @@
WK_USE_NEW_BUILD_SYSTEM = $(WK_USE_NEW_BUILD_SYSTEM_$(WK_WHICH_BUILD_SYSTEM))
WK_USE_NEW_BUILD_SYSTEM_legacy = NO
WK_USE_NEW_BUILD_SYSTEM_not_legacy = YES
+
+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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+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)";
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -37,8 +37,9 @@
OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
-HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
-INSTALL_PATH = /usr/local/lib;
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
+INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH);
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = PAL;
@@ -48,8 +49,8 @@
PAL_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR);
PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(WK_WHICH_BUILD_SYSTEM));
-PRIVATE_HEADERS_FOLDER_PATH_legacy = /usr/local/include/pal_flattened;
-PRIVATE_HEADERS_FOLDER_PATH_not_legacy = $(PAL_INSTALL_PATH_PREFIX)/usr/local/include/pal;
+PRIVATE_HEADERS_FOLDER_PATH_legacy = $(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal_flattened;
+PRIVATE_HEADERS_FOLDER_PATH_not_legacy = $(PAL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal;
APPLY_RULES_IN_COPY_HEADERS = $(WK_USE_NEW_BUILD_SYSTEM);
NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
@@ -65,14 +66,6 @@
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png;
EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a WebGPU.framework;
-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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-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)";
-
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
@@ -80,8 +73,8 @@
WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
SKIP_INSTALL = $(WK_NOT_$(FORCE_TOOL_INSTALL));
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/Scripts/generate-unified-sources.sh (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/Scripts/generate-unified-sources.sh 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/Scripts/generate-unified-sources.sh 2022-05-18 22:00:43 UTC (rev 294439)
@@ -8,9 +8,9 @@
if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
fi
fi
Modified: branches/safari-7614.1.11.9-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2022-05-18 22:00:43 UTC (rev 294439)
@@ -38697,7 +38697,7 @@
"$(SRCROOT)/Scripts/generate-unified-sources.sh",
"$(SRCROOT)/Sources.txt",
"$(SRCROOT)/SourcesCocoa.txt",
- "$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/generate-unified-source-bundles.rb",
+ "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts/generate-unified-source-bundles.rb",
);
name = "Generate Unified Sources";
outputFileListPaths = (
@@ -38873,9 +38873,9 @@
inputFileListPaths = (
);
inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/WebCore.profdata.compressed",
+ "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebCore.profdata.compressed",
"$(SRCROOT)/../../Tools/Profiling/Empty.profdata",
- "$(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/WebCore.profdata.compressed",
+ "$(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebCore.profdata.compressed",
);
name = "Copy Profiling Data";
outputFileListPaths = (
@@ -38885,7 +38885,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"usr/local/include/WebKitAdditions/Profiling/WebCore.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n exit 1
;\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.profdata -a lzfse;\nfi\n";
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"${WK_LIBRARY_HEADERS_FOLDER_PATH}/WebKitAdditions/Profiling/WebCore.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\n
exit 1;\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.profdata -a lzfse;\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -174,6 +174,24 @@
WK_USE_NEW_BUILD_SYSTEM_legacy = NO
WK_USE_NEW_BUILD_SYSTEM_not_legacy = YES
+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)";
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
NORMAL_WEBGPU_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
WGSL_INSTALL_PATH_PREFIX = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
Modified: branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSL.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSL.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSL.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -22,10 +22,11 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
-PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
-HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
+INSTALL_PATH = $(WGSL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PRIVATE_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH);
+PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH);
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
PRODUCT_NAME = wgsl;
EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
Modified: branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -21,7 +21,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
PRODUCT_NAME = WGSLUnitTests;
ENABLE_TESTABILITY = YES;
GENERATE_INFOPLIST_FILE = YES;
Modified: branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -23,7 +23,8 @@
#include "Version.xcconfig"
-HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(inherited);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
WK_PRIVATE_FRAMEWORKS_DIR_[sdk=macos*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/Mac/$(TARGET_MAC_OS_X_VERSION_MAJOR);
@@ -67,17 +68,6 @@
WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
WEBGPU_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
-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)";
-
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
Modified: branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -36,6 +36,18 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
+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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = c++2a;
@@ -165,7 +177,7 @@
WK_USE_RESTRICTED_ENTITLEMENTS = $(USE_INTERNAL_SDK);
EXCLUDED_SOURCE_FILE_NAMES = libWebKitAdditions.a _javascript_Core.framework
-WK_WEBKITADDITIONS_INSTALL_PATH = /usr/local/include/WebKitAdditions
+WK_WEBKITADDITIONS_INSTALL_PATH = $(WK_STATICLIB_INSTALL_PREFIX)/include/WebKitAdditions
WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH = $(SDKROOT)/$(WK_WEBKITADDITIONS_INSTALL_PATH)
WK_WEBKIT_DERIVEDSOURCES_INPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-input.xcfilelist
WK_WEBKIT_DERIVEDSOURCES_OUTPUT_XCFILELIST_ADDITIONS = $(WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH)/WebKit/DerivedSources-output.xcfilelist
Modified: branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/BaseTarget.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/BaseTarget.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -41,14 +41,15 @@
GCC_PREFIX_HEADER = WebKit2Prefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(WK_CORE_PREDICTION_DEFINES) $(WK_FORMATREADERBUNDLE_CODESIGNING_DEFINES) $(inherited) FRAMEWORK_NAME=WebKit;
-WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
-LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
-WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/pal/graphics/WebGPU;
+WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
+LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU;
ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
-ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
+ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)
-HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
PROFILE_DATA_FLAGS_ENABLED = -fprofile-instr-use=$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit/WebKit.profdata;
@@ -96,9 +97,9 @@
WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
_javascript_CORE_PRIVATE_HEADERS_DIR = $(_javascript_CORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
_javascript_CORE_PRIVATE_HEADERS_DIR_Release = $(_javascript_CORE_PRIVATE_HEADERS_engineering);
@@ -128,14 +129,16 @@
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES = -Wl,-dyld_env,DYLD_VERSIONED_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_YES[arch=arm64*][sdk=macosx11*] = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=$(WK_INSTALL_PATH_PREFIX)/System/Library/StagedFrameworks/Safari;
-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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
// webpushd should not be installed when building for downlevel.
WK_SKIP_INSTALL_WEBPUSHD[sdk=macos*] = $(WK_SKIP_INSTALL_WEBPUSHD_STAGING_$(USE_STAGING_INSTALL_PATH)_RELOCATABLE_$(WK_RELOCATABLE_FRAMEWORKS))
WK_SKIP_INSTALL_WEBPUSHD_STAGING_YES_RELOCATABLE_YES = YES
Modified: branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKit/Configurations/SandboxProfiles.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -1,7 +1,7 @@
INSTALL_PATH = $(INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_$(WK_INSTALL_OVERRIDE_SANDBOX_PROFILES));
INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_ = $(INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO);
-INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO = /usr/local/share/sandbox/profiles/embedded/builtin;
-INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_YES = /usr/local/share/sandbox;
+INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO = $(WK_STATICLIB_INSTALL_PREFIX)/share/sandbox/profiles/embedded/builtin;
+INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_YES = $(WK_STATICLIB_INSTALL_PREFIX)/share/sandbox;
INSTALLHDRS_SCRIPT_PHASE = YES;
INSTALLHDRS_COPY_PHASE = YES;
Modified: branches/safari-7614.1.11.9-branch/Source/WebKit/Scripts/generate-unified-sources.sh (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKit/Scripts/generate-unified-sources.sh 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKit/Scripts/generate-unified-sources.sh 2022-05-18 22:00:43 UTC (rev 294439)
@@ -8,9 +8,9 @@
if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
fi
fi
Modified: branches/safari-7614.1.11.9-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-18 22:00:43 UTC (rev 294439)
@@ -15869,7 +15869,7 @@
"$(SRCROOT)/Scripts/generate-unified-sources.sh",
"$(SRCROOT)/Sources.txt",
"$(SRCROOT)/SourcesCocoa.txt",
- "$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/generate-unified-source-bundles.rb",
+ "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts/generate-unified-source-bundles.rb",
);
name = "Generate Unified Sources";
outputFileListPaths = (
@@ -16631,9 +16631,9 @@
inputFileListPaths = (
);
inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/Profiling/WebKit.profdata.compressed",
+ "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebKit.profdata.compressed",
"$(SRCROOT)/../../Tools/Profiling/Empty.profdata",
- "$(SDK_DIR)/usr/local/include/WebKitAdditions/Profiling/WebKit.profdata.compressed",
+ "$(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions/Profiling/WebKit.profdata.compressed",
);
name = "Copy Profiling Data";
outputFileListPaths = (
@@ -16643,7 +16643,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"usr/local/include/WebKitAdditions/Profiling/WebKit.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH}\";\n exit 1;
\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}/${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.profdata -a lzfse;\nfi\n";
+ shellScript = "if [ \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n exit 0;\nfi\n\nif [ -z \"${PROFILE_DATA_FLAGS}\" ]; then\n exit 0;\nfi\n\nRELATIVE_PROFILE_DATA_PATH=\"${WK_LIBRARY_HEADERS_FOLDER_PATH}/WebKitAdditions/Profiling/WebKit.profdata.compressed\";\nABSOLUTE_PROFILE_DATA_PATH=\"${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ]; then\n ABSOLUTE_PROFILE_DATA_PATH=\"${SDK_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\nfi\n\nif [ ! -f \"${ABSOLUTE_PROFILE_DATA_PATH}\" ] || [ $(wc -c <${ABSOLUTE_PROFILE_DATA_PATH}) -lt 4096 ]; then\n if [ \"${CONFIGURATION}\" = \"Production\" ]; then\n echo \"Error: production build missing profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH}\";\n
exit 1;\n fi\n echo \"Missing or invalid profiling data at both ${ABSOLUTE_PROFILE_DATA_PATH} and ${BUILT_PRODUCTS_DIR}${RELATIVE_PROFILE_DATA_PATH} - falling back to empty file\";\n cp ${SRCROOT}/../../Tools/Profiling/Empty.profdata ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.profdata;\nelse\n echo \"Copying profiling data at ${ABSOLUTE_PROFILE_DATA_PATH}\";\n compression_tool -decode -i ${ABSOLUTE_PROFILE_DATA_PATH} -o ${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit/WebKit.profdata -a lzfse;\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -39,6 +39,21 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
+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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+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)";
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = c++2a;
Modified: branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -66,11 +66,12 @@
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) BUILDING_WEBKIT FRAMEWORK_NAME=WebKitLegacy $(inherited);
-WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
-LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
-WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include/pal/graphics/WebGPU;
+WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/WebKitAdditions;
+LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/webrtc;
+WEBGPU_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU $(SDKROOT)$(WK_ALTERNATE_FRAMEWORKS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/pal/graphics/WebGPU;
-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);
+HEADER_SEARCH_PATHS = "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)" $(WEBGPU_HEADER_SEARCH_PATHS) $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS) $(SRCROOT);
+SYSTEM_HEADER_SEARCH_PATHS = $(SDK_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH) $(inherited);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
@@ -164,18 +165,10 @@
WTF_BUILD_SCRIPTS_DIR_Release = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Debug = $(WTF_BUILD_SCRIPTS_DIR_engineering);
WTF_BUILD_SCRIPTS_DIR_Production = $(WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)/usr/local/include/wtf/Scripts;
-WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_YES = $(SDKROOT)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_Production_COCOA_TOUCH_NO = $(SDKROOT)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
+WTF_BUILD_SCRIPTS_DIR_engineering = $(BUILT_PRODUCTS_DIR)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/wtf/Scripts;
-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_YES = $(WK_INSTALL_PATH_PREFIX)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-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)";
-
WK_INSTALL_PATH_PREFIX = $(WK_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION)$(WK_MACOS_1015)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
WK_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_MACOS_SINCE_1015_USE_STAGING_INSTALL_PATH_YES = $(PLATFORM_OOB_SYSTEM_CONTENT_DIR);
Modified: branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/scripts/generate-unified-sources.sh (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/WebKitLegacy/scripts/generate-unified-sources.sh 2022-05-18 22:00:43 UTC (rev 294439)
@@ -8,9 +8,9 @@
if [ -z "${BUILD_SCRIPTS_DIR}" ]; then
if [ "${DEPLOYMENT_LOCATION}" == "YES" ]; then
- BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${SDKROOT}${WK_ALTERNATE_WEBKIT_SDK_PATH}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
else
- BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}/usr/local/include/wtf/Scripts"
+ BUILD_SCRIPTS_DIR="${BUILT_PRODUCTS_DIR}${WK_LIBRARY_HEADERS_FOLDER_PATH}/wtf/Scripts"
fi
fi
Modified: branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/Base.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/Base.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/Base.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -125,6 +125,15 @@
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
BMALLOC_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_LIBRARY_HEADERS_FOLDER_PATH = $(WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_NO = /usr/local/include;
+WK_LIBRARY_HEADERS_FOLDER_PATH_OVERRIDE_YES = /usr/local/include/safari-sdk;
+WK_LIBRARY_INSTALL_PATH = $(WK_LIBRARY_INSTALL_PATH_OVERRIDE_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_NO = /usr/local/lib;
+WK_LIBRARY_INSTALL_PATH_OVERRIDE_YES = /usr/local/lib/safari-sdk;
+
LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
WK_LLVM_LTO_NO = NO;
WK_LLVM_LTO_YES = $(WK_USER_LTO_MODE);
Modified: branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/bmalloc.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/bmalloc.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/bmalloc.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -22,8 +22,8 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
-PRIVATE_HEADERS_FOLDER_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/include/bmalloc;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
+PRIVATE_HEADERS_FOLDER_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)$(WK_LIBRARY_HEADERS_FOLDER_PATH)/bmalloc;
PRODUCT_NAME = bmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
Modified: branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/mbmalloc.xcconfig (294438 => 294439)
--- branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/mbmalloc.xcconfig 2022-05-18 21:58:19 UTC (rev 294438)
+++ branches/safari-7614.1.11.9-branch/Source/bmalloc/Configurations/mbmalloc.xcconfig 2022-05-18 22:00:43 UTC (rev 294439)
@@ -22,7 +22,7 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
EXECUTABLE_PREFIX = lib;
-INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)/usr/local/lib;
+INSTALL_PATH = $(BMALLOC_INSTALL_PATH_PREFIX)$(WK_LIBRARY_INSTALL_PATH);
PRODUCT_NAME = mbmalloc;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
