Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (290156 => 290157)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-18 21:12:51 UTC (rev 290157)
@@ -1,3 +1,15 @@
+2022-02-18 Elliott Williams <e...@apple.com>
+
+ [XCBuild] "All Modules" workspace builds building out of order
+ https://bugs.webkit.org/show_bug.cgi?id=236813
+
+ Reviewed by Alexey Proskuryakov.
+
+ Nothing particularly interesting here, but should fix build failures on
+ Apple-BigSur-XCBuild-Release-Build <https://build.webkit.org/#/builders/463>.
+
+ * libwebrtc.xcodeproj/project.pbxproj: Ensure yasm is built before using it.
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj (290156 => 290157)
--- trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj/project.pbxproj 2022-02-18 21:12:51 UTC (rev 290157)
@@ -3884,7 +3884,7 @@
outputFiles = (
"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
);
- script = "SOURCE_DIR=\"${SRCROOT}/Source/third_party/libvpx/source\"\nSOURCE_FILE=\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\"\nOBJECT_FILE=\"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o\"\n\"${BUILT_PRODUCTS_DIR}/yasm\" -fmacho64 -I \"${SOURCE_DIR}/config\" -I \"${SOURCE_DIR}/config/mac/x64\" -I \"${SOURCE_DIR}/libvpx\" -o \"${OBJECT_FILE}.tmp\" \"${SOURCE_FILE}\"\ncmp -s \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\" && rm -f \"${OBJECT_FILE}.tmp\" || mv \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\"\n[[ \"${SOURCE_FILE}\" -nt \"${OBJECT_FILE}\" ]] && touch \"${OBJECT_FILE}\" || true\n";
+ script = "set -e\nSOURCE_DIR=\"${SRCROOT}/Source/third_party/libvpx/source\"\nSOURCE_FILE=\"${INPUT_FILE_DIR}/${INPUT_FILE_BASE}.asm\"\nOBJECT_FILE=\"${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o\"\n\"${BUILT_PRODUCTS_DIR}/yasm\" -fmacho64 -I \"${SOURCE_DIR}/config\" -I \"${SOURCE_DIR}/config/mac/x64\" -I \"${SOURCE_DIR}/libvpx\" -o \"${OBJECT_FILE}.tmp\" \"${SOURCE_FILE}\"\ncmp -s \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\" && rm -f \"${OBJECT_FILE}.tmp\" || mv \"${OBJECT_FILE}.tmp\" \"${OBJECT_FILE}\"\n[[ \"${SOURCE_FILE}\" -nt \"${OBJECT_FILE}\" ]] && touch \"${OBJECT_FILE}\" || true\n";
};
/* End PBXBuildRule section */
@@ -17230,6 +17230,7 @@
buildConfigurationList = 4105EB7F212E01D2008C0C20 /* Build configuration list for PBXNativeTarget "vpx" */;
buildPhases = (
4105EB6C212E01D2008C0C20 /* Headers */,
+ DD05A35A27BF00DF0096EFAB /* (Legacy) Ensure yasm is built */,
4105EB74212E01D2008C0C20 /* Sources */,
4105EB7C212E01D2008C0C20 /* Frameworks */,
4105EB7D212E01D2008C0C20 /* CopyFiles */,
@@ -17532,6 +17533,25 @@
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Scripts/create-symlink-to-altroot.sh\"\n";
};
+ DD05A35A27BF00DF0096EFAB /* (Legacy) Ensure yasm is built */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputFileListPaths = (
+ );
+ inputPaths = (
+ "$(BUILT_PRODUCTS_DIR)/yasm",
+ );
+ name = "(Legacy) Ensure yasm is built";
+ outputFileListPaths = (
+ );
+ outputPaths = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "# Once support for the legacy build system is dropped, delete this build phase\n# and move its input file to the \"Assembly files\" build rule.\n";
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
Modified: trunk/Source/WebCore/PAL/ChangeLog (290156 => 290157)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-02-18 21:12:51 UTC (rev 290157)
@@ -1,3 +1,14 @@
+2022-02-18 Elliott Williams <e...@apple.com>
+
+ [XCBuild] "All Modules" workspace builds building out of order
+ https://bugs.webkit.org/show_bug.cgi?id=236813
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add product dependency on WTF, since PAL uses its headers without linking against it.
+
+ * PAL.xcodeproj/project.pbxproj:
+
2022-02-18 Jer Noble <jer.no...@apple.com>
[Cocoa] Make AVFoundationSPI.h robust against changes in system headers
Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (290156 => 290157)
--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2022-02-18 21:12:51 UTC (rev 290157)
@@ -135,6 +135,13 @@
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)));
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (290156 => 290157)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2022-02-18 21:12:51 UTC (rev 290157)
@@ -52,7 +52,9 @@
PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = $(inherited) *.tiff *Cursor.png;
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a libWebKitAdditions.a;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (290156 => 290157)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2022-02-18 21:12:51 UTC (rev 290157)
@@ -379,6 +379,7 @@
CDACB361238742740018D7CE /* MediaToolboxSoftLink.h in Headers */ = {isa = PBXBuildFile; fileRef = CDACB35F23873E480018D7CE /* MediaToolboxSoftLink.h */; };
CDF91113220E4EEC001EA39E /* CelestialSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDF91112220E4EEC001EA39E /* CelestialSPI.h */; };
CE5673872151A7B9002F92D7 /* IOKitSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE5673862151A7B9002F92D7 /* IOKitSPI.h */; };
+ DD05A36027BF0ACE0096EFAB /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DD05A35F27BF0AC40096EFAB /* libWTF.a */; };
DDB04F32278E4F1B008D3678 /* libWebKitAdditions.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = DDE99300278D07B800F60D26 /* libWebKitAdditions.a */; };
DF83E209263734F1000825EF /* CryptoKitPrivateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */; };
E327C0DF260BE436002281C5 /* NotifySPI.h in Headers */ = {isa = PBXBuildFile; fileRef = E327C0DE260BDC90002281C5 /* NotifySPI.h */; };
@@ -423,6 +424,7 @@
dstSubfolderSpec = 16;
files = (
DDB04F32278E4F1B008D3678 /* libWebKitAdditions.a in Product Dependencies */,
+ DD05A36027BF0ACE0096EFAB /* libWTF.a in Product Dependencies */,
);
name = "Product Dependencies";
runOnlyForDeploymentPostprocessing = 0;
@@ -842,6 +844,7 @@
CDACB35F23873E480018D7CE /* MediaToolboxSoftLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaToolboxSoftLink.h; sourceTree = "<group>"; };
CDF91112220E4EEC001EA39E /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
CE5673862151A7B9002F92D7 /* IOKitSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOKitSPI.h; sourceTree = "<group>"; };
+ DD05A35F27BF0AC40096EFAB /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
DDE99300278D07B800F60D26 /* libWebKitAdditions.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libWebKitAdditions.a; sourceTree = BUILT_PRODUCTS_DIR; };
DF83E208263734F1000825EF /* CryptoKitPrivateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoKitPrivateSPI.h; sourceTree = "<group>"; };
E327C0DE260BDC90002281C5 /* NotifySPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotifySPI.h; sourceTree = "<group>"; };
@@ -1527,6 +1530,7 @@
isa = PBXGroup;
children = (
DDE99300278D07B800F60D26 /* libWebKitAdditions.a */,
+ DD05A35F27BF0AC40096EFAB /* libWTF.a */,
);
name = Frameworks;
sourceTree = "<group>";
Modified: trunk/Source/WebGPU/ChangeLog (290156 => 290157)
--- trunk/Source/WebGPU/ChangeLog 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebGPU/ChangeLog 2022-02-18 21:12:51 UTC (rev 290157)
@@ -1,3 +1,15 @@
+2022-02-18 Elliott Williams <e...@apple.com>
+
+ [XCBuild] "All Modules" workspace builds building out of order
+ https://bugs.webkit.org/show_bug.cgi?id=236813
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add product dependency on WTF. WGSL uses its headers without linking against it.
+
+ * Configurations/WGSL.xcconfig:
+ * WebGPU.xcodeproj/project.pbxproj:
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (290156 => 290157)
--- trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-02-18 21:12:51 UTC (rev 290157)
@@ -162,6 +162,12 @@
WK_USER_LTO_MODE_ = $(WK_DEFAULT_LTO_MODE);
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_thin);
+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
+
NORMAL_WEBGPU_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
WGSL_INSTALL_PATH_PREFIX = $(WGSL_INSTALL_PATH_PREFIX_DEPLOYMENT_$(DEPLOYMENT_LOCATION));
Modified: trunk/Source/WebGPU/Configurations/WGSL.xcconfig (290156 => 290157)
--- trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebGPU/Configurations/WGSL.xcconfig 2022-02-18 21:12:51 UTC (rev 290157)
@@ -28,4 +28,7 @@
HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
PRODUCT_NAME = wgsl;
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = libWTF.a;
+
OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);
Modified: trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj (290156 => 290157)
--- trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Source/WebGPU/WebGPU.xcodeproj/project.pbxproj 2022-02-18 21:12:51 UTC (rev 290157)
@@ -48,6 +48,7 @@
338BB2D227B6B63F00E066AB /* SourceSpan.h in Headers */ = {isa = PBXBuildFile; fileRef = 338BB2D127B6B63F00E066AB /* SourceSpan.h */; };
338BB2D427B6B66C00E066AB /* Lexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 338BB2D327B6B66C00E066AB /* Lexer.h */; };
338BB2D627B6B68700E066AB /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 338BB2D527B6B68700E066AB /* Lexer.cpp */; };
+ DD05A35C27BF09C60096EFAB /* libWTF.a in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 1CEBD8292716CAE700A5254D /* libWTF.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -83,6 +84,17 @@
files = (
);
runOnlyForDeploymentPostprocessing = 1;
+ };
+ DD05A35B27BF09B60096EFAB /* Product Dependencies */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 16;
+ files = (
+ DD05A35C27BF09C60096EFAB /* libWTF.a in Product Dependencies */,
+ );
+ name = "Product Dependencies";
+ runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */
@@ -440,6 +452,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 1CEBD7F32716B2CC00A5254D /* Build configuration list for PBXNativeTarget "WGSL" */;
buildPhases = (
+ DD05A35B27BF09B60096EFAB /* Product Dependencies */,
1CEBD7EE2716B2CC00A5254D /* Headers */,
1CEBD7EF2716B2CC00A5254D /* Sources */,
1CEBD7F02716B2CC00A5254D /* Frameworks */,
Modified: trunk/Tools/ChangeLog (290156 => 290157)
--- trunk/Tools/ChangeLog 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Tools/ChangeLog 2022-02-18 21:12:51 UTC (rev 290157)
@@ -1,3 +1,16 @@
+2022-02-18 Elliott Williams <e...@apple.com>
+
+ [XCBuild] "All Modules" workspace builds building out of order
+ https://bugs.webkit.org/show_bug.cgi?id=236813
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add product dependency on WebKit. LayoutTestHelper uses headers from WebKit and lower
+ frameworks without linking against them.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
+
2022-02-18 J Pascoe <j_pas...@apple.com>
[WebAuthn] Add credentialID to _WKWebAuthenticationAssertionResponse and userHandle in getAllLocalAuthenticatorCredentials
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (290156 => 290157)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2022-02-18 21:12:51 UTC (rev 290157)
@@ -119,6 +119,7 @@
BCF6C6500C98E9C000AC063E /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCF6C64F0C98E9C000AC063E /* GCController.cpp */; };
C23EA2081BC9F05100C980B7 /* FontWithFeatures.otf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2061BC9EABA00C980B7 /* FontWithFeatures.otf */; };
C23EA2091BC9F05100C980B7 /* FontWithFeatures.ttf in Copy Font Files */ = {isa = PBXBuildFile; fileRef = C23EA2071BC9EABA00C980B7 /* FontWithFeatures.ttf */; };
+ DD20DE7627BDEAE90093D175 /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
DDD2187827A21850002B7025 /* WebKit.framework in Product Dependencies */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
E1B7816511AF31B7007E1BC2 /* MockGeolocationProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = E1B7808711AF1669007E1BC2 /* MockGeolocationProvider.mm */; };
F4010B7B24DA201F00A876E2 /* PoseAsClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4010B7924DA200E00A876E2 /* PoseAsClass.mm */; };
@@ -199,6 +200,17 @@
name = "Copy Font Files";
runOnlyForDeploymentPostprocessing = 0;
};
+ DD20DE7527BDEAD70093D175 /* Product Dependencies */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 16;
+ files = (
+ DD20DE7627BDEAE90093D175 /* WebKit.framework in Product Dependencies */,
+ );
+ name = "Product Dependencies";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
DDD2187727A21842002B7025 /* Product Dependencies */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -837,6 +849,7 @@
isa = PBXNativeTarget;
buildConfigurationList = 2D403F15150871F9005358D2 /* Build configuration list for PBXNativeTarget "LayoutTestHelper" */;
buildPhases = (
+ DD20DE7527BDEAD70093D175 /* Product Dependencies */,
2D403ED8150871F9005358D2 /* Sources */,
2D403F03150871F9005358D2 /* Frameworks */,
);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (290156 => 290157)
--- trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2022-02-18 20:58:46 UTC (rev 290156)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2022-02-18 21:12:51 UTC (rev 290157)
@@ -28,6 +28,9 @@
OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
STRIP_STYLE = debugging;
+EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_PRODUCT_DEPENDENCY_NAMES_$(WK_WHICH_BUILD_SYSTEM));
+EXCLUDED_PRODUCT_DEPENDENCY_NAMES_legacy = WebKit.framework;
+
INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
INSTALL_PATH_Release = $(INSTALL_PATH);
INSTALL_PATH_Debug = $(INSTALL_PATH);
