Diff
Modified: branches/safari-614.1.11-branch/Source/WebGPU/ChangeLog (293960 => 293961)
--- branches/safari-614.1.11-branch/Source/WebGPU/ChangeLog 2022-05-09 03:54:07 UTC (rev 293960)
+++ branches/safari-614.1.11-branch/Source/WebGPU/ChangeLog 2022-05-09 03:54:11 UTC (rev 293961)
@@ -1,3 +1,44 @@
+2022-05-08 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r293937. rdar://problem/92524485
+
+ [WebGPU] Fix build on downlevel OSes in Apple's build system
+ https://bugs.webkit.org/show_bug.cgi?id=240159
+ <rdar://problem/92524485>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Some variables from WebKitTargetConditionals.xcconfig and
+ PlatformSupport.xcconfig are used, so we have to make sure
+ we include them. Also refactor the INSTALL_PATH variable a
+ bit.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebGPU.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig: Added.
+ * WebGPU.xcodeproj/project.pbxproj:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@293937 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-05-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [WebGPU] Fix build on downlevel OSes in Apple's build system
+ https://bugs.webkit.org/show_bug.cgi?id=240159
+ <rdar://problem/92524485>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Some variables from WebKitTargetConditionals.xcconfig and
+ PlatformSupport.xcconfig are used, so we have to make sure
+ we include them. Also refactor the INSTALL_PATH variable a
+ bit.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebGPU.xcconfig:
+ * Configurations/WebKitTargetConditionals.xcconfig: Added.
+ * WebGPU.xcodeproj/project.pbxproj:
+
2022-04-28 Russell Epstein <repst...@apple.com>
Cherry-pick r293558. rdar://problem/91769511
Modified: branches/safari-614.1.11-branch/Source/WebGPU/Configurations/Base.xcconfig (293960 => 293961)
--- branches/safari-614.1.11-branch/Source/WebGPU/Configurations/Base.xcconfig 2022-05-09 03:54:07 UTC (rev 293960)
+++ branches/safari-614.1.11-branch/Source/WebGPU/Configurations/Base.xcconfig 2022-05-09 03:54:11 UTC (rev 293961)
@@ -22,7 +22,9 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include? "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
+#include? "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/PlatformSupport.xcconfig"
#include "SDKVariant.xcconfig"
+#include "WebKitTargetConditionals.xcconfig"
CODE_SIGN_IDENTITY = -;
AD_HOC_CODE_SIGNING_ALLOWED = YES;
Modified: branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebGPU.xcconfig (293960 => 293961)
--- branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-05-09 03:54:07 UTC (rev 293960)
+++ branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-05-09 03:54:11 UTC (rev 293961)
@@ -38,10 +38,9 @@
INFOPLIST_FILE = Info.plist;
-INSTALL_PATH = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_$(USE_SYSTEM_CONTENT_PATH));
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_YES = $(SYSTEM_CONTENT_PATH)$(WEBGPU_FRAMEWORKS_DIR);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_ = $(INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO);
-INSTALL_PATH_USE_SYSTEM_CONTENT_PATH_NO = $(WEBGPU_FRAMEWORKS_DIR);
+INSTALL_PATH_PREFIX = $(INSTALL_PATH_PREFIX_$(USE_SYSTEM_CONTENT_PATH));
+INSTALL_PATH_PREFIX_YES = $(SYSTEM_CONTENT_PATH);
+INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBGPU_FRAMEWORKS_DIR);
SECONDARY_STAGED_FRAMEWORK_DIRECTORY = $(SYSTEM_SECONDARY_CONTENT_PATH)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH = $(COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_$(SDK_VARIANT));
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
Added: branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebKitTargetConditionals.xcconfig (0 => 293961)
--- branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebKitTargetConditionals.xcconfig (rev 0)
+++ branches/safari-614.1.11-branch/Source/WebGPU/Configurations/WebKitTargetConditionals.xcconfig 2022-05-09 03:54:11 UTC (rev 293961)
@@ -0,0 +1,227 @@
+// Copyright (C) 2018-2022 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Use the following helpers to define build settings whose value depends on the target
+// macOS version in a succinct and future-proof way.
+//
+// Example 1: To give the SMOOTHNESS build setting the value 3 in macOS 10.12 and later and the
+// value 2 in earlier versions, write:
+//
+// SMOOTHNESS = $(SMOOTHNESS$(WK_MACOS_1012));
+// SMOOTHNESS_MACOS_BEFORE_1012 = 2;
+// SMOOTHNESS_MACOS_SINCE_1012 = 3;
+//
+// Example 2: To define ENABLE_COLOR to ENABLE_COLOR in all platforms except macOS 10.12 and
+// earlier write:
+//
+// ENABLE_COLOR = ENABLE_COLOR;
+// ENABLE_COLOR[sdk=macosx*] = $(ENABLE_COLOR$(WK_MACOS_1013));
+// ENABLE_COLOR_MACOS_SINCE_1013 = $(ENABLE_COLOR);
+//
+// Example 3: To give EXTRA_PATH one value before macOS 10.12, another value in macOS 10.12 and
+// macOS 10.13, and a third value in macOS 10.14 and later, write:
+//
+// EXTRA_PATH = $(EXTRA_PATH$(WK_MACOS_1012_1014));
+// EXTRA_PATH_MACOS_BEFORE_1012 = "/Library/Application Support/WebKit";
+// EXTRA_PATH_MACOS_BEFORE_1014 = /System/Library/CoreServices;
+// EXTRA_PATH_MACOS_SINCE_1014 = /System/Library/PrivateFrameworks;
+
+// macOS
+
+WK_MACOS_BEFORE_1014 = $(WK_MACOS_BEFORE_1014_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1014_101300 = YES;
+
+WK_MACOS_BEFORE_1015 = $(WK_MACOS_BEFORE_1015_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1015_101300 = YES;
+WK_MACOS_BEFORE_1015_101400 = YES;
+
+WK_MACOS_BEFORE_1016 = $(WK_MACOS_BEFORE_1016_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1016_101300 = YES;
+WK_MACOS_BEFORE_1016_101400 = YES;
+WK_MACOS_BEFORE_1016_101500 = YES;
+
+WK_MACOS_BEFORE_1100 = $(WK_MACOS_BEFORE_1100_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1100_101300 = YES;
+WK_MACOS_BEFORE_1100_101400 = YES;
+WK_MACOS_BEFORE_1100_101500 = YES;
+
+WK_MACOS_BEFORE_1200 = $(WK_MACOS_BEFORE_1200_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1200_101300 = YES;
+WK_MACOS_BEFORE_1200_101400 = YES;
+WK_MACOS_BEFORE_1200_101500 = YES;
+WK_MACOS_BEFORE_1200_110000 = YES;
+
+WK_MACOS_BEFORE_1300 = $(WK_MACOS_BEFORE_1300_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WK_MACOS_BEFORE_1300_101300 = YES;
+WK_MACOS_BEFORE_1300_101400 = YES;
+WK_MACOS_BEFORE_1300_101500 = YES;
+WK_MACOS_BEFORE_1300_110000 = YES;
+WK_MACOS_BEFORE_1300_120000 = YES;
+
+WK_MACOS_1014 = $(WK_MACOS_1014_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_ = _MACOS_SINCE_1014;
+WK_MACOS_1014_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1014_1015 = $(WK_MACOS_1014_1015_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1015_ = $(WK_MACOS_1015);
+WK_MACOS_1014_1015_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1014_1016 = $(WK_MACOS_1014_1016_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1016_ = $(WK_MACOS_1016);
+WK_MACOS_1014_1016_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1014_1100 = $(WK_MACOS_1014_1100_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1100_ = $(WK_MACOS_1100);
+WK_MACOS_1014_1100_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1014_1200 = $(WK_MACOS_1014_1200_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1014_1200_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1014_1300 = $(WK_MACOS_1014_1300_$(WK_MACOS_BEFORE_1014));
+WK_MACOS_1014_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1014_1300_YES = _MACOS_BEFORE_1014;
+
+WK_MACOS_1015 = $(WK_MACOS_1015_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_ = _MACOS_SINCE_1015;
+WK_MACOS_1015_YES = _MACOS_BEFORE_1015;
+
+WK_MACOS_1015_1016 = $(WK_MACOS_1015_1016_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1016_ = $(WK_MACOS_1016);
+WK_MACOS_1015_1016_YES = _MACOS_BEFORE_1015;
+
+WK_MACOS_1015_1100 = $(WK_MACOS_1015_1100_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1100_ = $(WK_MACOS_1100);
+WK_MACOS_1015_1100_YES = _MACOS_BEFORE_1015;
+
+WK_MACOS_1015_1200 = $(WK_MACOS_1015_1200_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1200_ = $(WK_MACOS_1200);
+WK_MACOS_1015_1200_YES = _MACOS_BEFORE_1015;
+
+WK_MACOS_1015_1300 = $(WK_MACOS_1015_1300_$(WK_MACOS_BEFORE_1015));
+WK_MACOS_1015_1300_ = $(WK_MACOS_1300);
+WK_MACOS_1015_1300_YES = _MACOS_BEFORE_1015;
+
+WK_MACOS_1016 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_ = _MACOS_SINCE_1016;
+WK_MACOS_1016_YES = _MACOS_BEFORE_1016;
+
+WK_MACOS_1016_1100 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1100 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1100_YES = _MACOS_BEFORE_1016;
+
+WK_MACOS_1016_1200 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1200 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1200_YES = _MACOS_BEFORE_1016;
+
+WK_MACOS_1016_1300 = $(WK_MACOS_1016_$(WK_MACOS_BEFORE_1016));
+WK_MACOS_1016_1300 = _MACOS_SINCE_1016;
+WK_MACOS_1016_1300_YES = _MACOS_BEFORE_1016;
+
+WK_MACOS_1100 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_ = _MACOS_SINCE_1100;
+WK_MACOS_1100_YES = _MACOS_BEFORE_1100;
+
+WK_MACOS_1100_1200 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1200 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1200_YES = _MACOS_BEFORE_1100;
+
+WK_MACOS_1100_1300 = $(WK_MACOS_1100_$(WK_MACOS_BEFORE_1100));
+WK_MACOS_1100_1300 = _MACOS_SINCE_1100;
+WK_MACOS_1100_1300_YES = _MACOS_BEFORE_1100;
+
+WK_MACOS_1200 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_ = _MACOS_SINCE_1200;
+WK_MACOS_1200_YES = _MACOS_BEFORE_1200;
+
+WK_MACOS_1200_1300 = $(WK_MACOS_1200_$(WK_MACOS_BEFORE_1200));
+WK_MACOS_1200_1300 = _MACOS_SINCE_1200;
+WK_MACOS_1200_1300_YES = _MACOS_BEFORE_1200;
+
+WK_MACOS_1300 = $(WK_MACOS_1300_$(WK_MACOS_BEFORE_1300));
+WK_MACOS_1300_ = _MACOS_SINCE_1300;
+WK_MACOS_1300_YES = _MACOS_BEFORE_1300;
+
+// iOS
+
+WK_IOS_BEFORE_13 = $(WK_IOS_BEFORE_13_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+
+WK_IOS_BEFORE_14 = $(WK_IOS_BEFORE_14_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_14_13 = YES;
+
+WK_IOS_BEFORE_15 = $(WK_IOS_BEFORE_15_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_15_13 = YES;
+WK_IOS_BEFORE_15_14 = YES;
+
+WK_IOS_BEFORE_16 = $(WK_IOS_BEFORE_16_$(IPHONEOS_DEPLOYMENT_TARGET:base));
+WK_IOS_BEFORE_16_13 = YES;
+WK_IOS_BEFORE_16_14 = YES;
+WK_IOS_BEFORE_16_15 = YES;
+
+WK_IOS_13 = $(WK_IOS_13_$(WK_IOS_BEFORE_13));
+WK_IOS_13_ = _IOS_SINCE_13;
+WK_IOS_13_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_14 = $(WK_IOS_13_14_$(WK_IOS_BEFORE_13));
+WK_IOS_13_14_ = $(WK_IOS_14);
+WK_IOS_13_14_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_15 = $(WK_IOS_13_15_$(WK_IOS_BEFORE_13));
+WK_IOS_13_15_ = $(WK_IOS_15);
+WK_IOS_13_15_YES = _IOS_BEFORE_13;
+
+WK_IOS_13_16 = $(WK_IOS_13_16_$(WK_IOS_BEFORE_13));
+WK_IOS_13_16_ = $(WK_IOS_16);
+WK_IOS_13_16_YES = _IOS_BEFORE_13;
+
+WK_IOS_14 = $(WK_IOS_14_$(WK_IOS_BEFORE_14));
+WK_IOS_14_ = _IOS_SINCE_14;
+WK_IOS_14_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_15 = $(WK_IOS_14_15_$(WK_IOS_BEFORE_14));
+WK_IOS_14_15_ = $(WK_IOS_15);
+WK_IOS_14_15_YES = _IOS_BEFORE_14;
+
+WK_IOS_14_16 = $(WK_IOS_14_16_$(WK_IOS_BEFORE_14));
+WK_IOS_14_16_ = $(WK_IOS_16);
+WK_IOS_14_16_YES = _IOS_BEFORE_14;
+
+WK_IOS_15 = $(WK_IOS_15_$(WK_IOS_BEFORE_15));
+WK_IOS_15_ = _IOS_SINCE_15;
+WK_IOS_15_YES = _IOS_BEFORE_15;
+
+WK_IOS_15_16 = $(WK_IOS_15_16_$(WK_IOS_BEFORE_15));
+WK_IOS_15_16_ = $(WK_IOS_16);
+WK_IOS_15_16_YES = _IOS_BEFORE_15;
+
+WK_IOS_16 = $(WK_IOS_16_$(WK_IOS_BEFORE_16));
+WK_IOS_16_ = _IOS_SINCE_16;
+WK_IOS_16_YES = _IOS_BEFORE_16;
+
+
+// tvOS
+WK_TVOS_BEFORE_16 = $(WK_TVOS_BEFORE_16_$(TVOS_DEPLOYMENT_TARGET:base));
+WK_TVOS_BEFORE_16_13 = YES;
+WK_TVOS_BEFORE_16_14 = YES;
+WK_TVOS_BEFORE_16_15 = YES;
+
Modified: branches/safari-614.1.11-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (293960 => 293961)
--- branches/safari-614.1.11-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-05-09 03:54:07 UTC (rev 293960)
+++ branches/safari-614.1.11-branch/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-05-09 03:54:11 UTC (rev 293961)
@@ -135,6 +135,7 @@
1C023D4A274495B9001DB734 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1C0F41EC280940650005886D /* HardwareCapabilities.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = HardwareCapabilities.mm; sourceTree = "<group>"; };
1C0F41ED280940650005886D /* HardwareCapabilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HardwareCapabilities.h; sourceTree = "<group>"; };
+ 1C1C323E2824F28D007C9E7E /* WebKitTargetConditionals.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTargetConditionals.xcconfig; sourceTree = "<group>"; };
1C2CEDED271E8A7300EDC16F /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
1C33755D27FA23B8002F1644 /* IsValidToUseWith.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IsValidToUseWith.h; sourceTree = "<group>"; };
1C5319BD27BDC6CB00CD127E /* CommandLinePlayground */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = CommandLinePlayground; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -415,6 +416,7 @@
1CEBD8012716B9AB00A5254D /* SDKVariant.xcconfig */,
1CC0C8CA273A819100D0B481 /* Version.xcconfig */,
1CEBD7FC2716B64400A5254D /* WebGPU.xcconfig */,
+ 1C1C323E2824F28D007C9E7E /* WebKitTargetConditionals.xcconfig */,
1CEBD7FD2716B64F00A5254D /* WGSL.xcconfig */,
1C023D472744916D001DB734 /* WGSLUnitTests.xcconfig */,
);
