Diff
Modified: trunk/ChangeLog (292844 => 292845)
--- trunk/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,25 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add AD_HOC_CODE_SIGNING_ALLOWED=YES (similar to
+ https://commits.webkit.org/249449@main) and
+ DISABLE_SDK_METADATA_PARSING=YES in various places to work around
+ open-source workspace build failures when building for watchOS.
+
+ * WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme:
+ - Remove libwebrtc from the "All Source" scheme. On watchOS, it doesn't
+ build, and on other platforms, it is an implicit dependency, so
+ removing it lets the build system determine whether or not it should
+ build.
+ - Remove MiniBrowser from the "All Source" scheme, as it's part of "All
+ Tools". "All Tools" probably shouldn't be built for embedded
+ platforms, as it contains some Mac-only tools, but we do not enforce
+ this.
+
2022-04-12 Elliott Williams <e...@apple.com>
Reland "[XCBuild] Enable dependency validation by default"
Modified: trunk/Source/WebCore/ChangeLog (292844 => 292845)
--- trunk/Source/WebCore/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,14 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebCore.xcconfig:
+ * Configurations/WebCoreTestSupport.xcconfig:
+
2022-04-13 Michael Catanzaro <mcatanz...@redhat.com>
Misc compiler warnings, April 2022 edition
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (292844 => 292845)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -25,6 +25,7 @@
#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
+AD_HOC_CODE_SIGNING_ALLOWED = YES;
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (292844 => 292845)
--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -78,6 +78,9 @@
INSTALL_PATH_cocoatouch = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR);
+// Workaround for "_javascript_Core is not available when building for watchOS." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(DYLIB_INSTALL_NAME_BASE_PLATFORM_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (292844 => 292845)
--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -43,6 +43,9 @@
SKIP_INSTALL_NO = YES;
SKIP_INSTALL_YES = NO;
+// Workaround for "_javascript_Core is not available when building for watchOS." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
Modified: trunk/Source/WebGPU/ChangeLog (292844 => 292845)
--- trunk/Source/WebGPU/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebGPU/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,13 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebGPU.xcconfig:
+
2022-04-12 Elliott Williams <e...@apple.com>
[Xcode] In open-source builds, disable bitcode in xcconfigs instead of build-webkit
Modified: trunk/Source/WebGPU/Configurations/Base.xcconfig (292844 => 292845)
--- trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebGPU/Configurations/Base.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -25,6 +25,7 @@
#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
+AD_HOC_CODE_SIGNING_ALLOWED = YES;
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (292844 => 292845)
--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -47,6 +47,9 @@
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_ = NO
COPY_STAGED_FRAMEWORKS_TO_SECONDARY_PATH_SDK_VARIANT_iosmac = NO
+// Workaround for "_javascript_Core is not available when building for watchOS." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBGPU_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE_YES = $(WEBGPU_FRAMEWORKS_DIR);
Modified: trunk/Source/WebInspectorUI/ChangeLog (292844 => 292845)
--- trunk/Source/WebInspectorUI/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebInspectorUI/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,12 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+
2022-04-13 Patrick Angle <pan...@apple.com>
Web Inspector: Clean up `WI.DOMNode` to no longer require the shared `WI.DOMManager` be passed during construction
Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (292844 => 292845)
--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -4,6 +4,7 @@
#include "WebKitTargetConditionals.xcconfig"
CODE_SIGN_IDENTITY = -;
+AD_HOC_CODE_SIGNING_ALLOWED = YES;
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Modified: trunk/Source/WebKit/ChangeLog (292844 => 292845)
--- trunk/Source/WebKit/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebKit/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,12 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/WebKit.xcconfig:
+
2022-04-13 Chris Dumez <cdu...@apple.com>
WebContent crashes with SIGTERM_TIMEOUT on macOS
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (292844 => 292845)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -35,6 +35,9 @@
INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(WEBKIT_FRAMEWORKS_DIR);
+// Workaround for "_javascript_Core is not available when building for watchOS." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE_YES = $(WEBKIT_FRAMEWORKS_DIR);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (292844 => 292845)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-04-14 00:15:54 UTC (rev 292845)
@@ -1,3 +1,13 @@
+2022-04-13 Elliott Williams <e...@apple.com>
+
+ [Xcode] Fix public watchOS workspace build by updating scheme and build settings
+ https://bugs.webkit.org/show_bug.cgi?id=239301
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/Base.xcconfig:
+ * Configurations/WebKitLegacy.xcconfig:
+
2022-04-12 Elliott Williams <e...@apple.com>
[Xcode] In open-source builds, disable bitcode in xcconfigs instead of build-webkit
Modified: trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig (292844 => 292845)
--- trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Base.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -25,6 +25,7 @@
#include "SDKVariant.xcconfig"
CODE_SIGN_IDENTITY = -;
+AD_HOC_CODE_SIGNING_ALLOWED = YES;
USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
USE_INTERNAL_SDK_Production = YES;
Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (292844 => 292845)
--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig 2022-04-14 00:15:54 UTC (rev 292845)
@@ -77,6 +77,9 @@
INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH_COCOA_TOUCH_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
+// Workaround for "_javascript_Core is not available when building for watchOS." error (rdar://91668054)
+DISABLE_SDK_METADATA_PARSING[sdk=watch*] = YES
+
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme (292844 => 292845)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2022-04-13 23:43:01 UTC (rev 292844)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source.xcscheme 2022-04-14 00:15:54 UTC (rev 292845)
@@ -56,20 +56,6 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "FB39D0D01200F0E300088E69"
- BuildableName = "libwebrtc.dylib"
- BlueprintName = "libwebrtc"
- ReferencedContainer = "container:Source/ThirdParty/libwebrtc/libwebrtc.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
BlueprintIdentifier = "31DB794F2491C33300982878"
BuildableName = "ANGLE"
BlueprintName = "ANGLE"
@@ -166,16 +152,6 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "8D1107260486CEB800E47090"
- BuildableName = "MiniBrowser.app"
- BlueprintName = "MiniBrowser"
- ReferencedContainer = "container:Tools/MiniBrowser/MiniBrowser.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
