Diff
Modified: trunk/ChangeLog (292590 => 292591)
--- trunk/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,26 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Set VALIDATE_DEPENDENCIES=YES_ERROR everywhere, so that builds fail
+ when task outputs are missing.
+
+ The only interesting detail is that we need to set an extended
+ attribute on the user's build directory in order for XCBuild to
+ validate dependencies _within_ that directory. Since a users' build
+ directory may not be created by XCBuild, have build-webkit and
+ set-webkit-configuration set the attribute manually.
+
+ * Makefile.shared: Remove the VALIDATE_DEPENDENCIES opt-in logic.
+ Always call through to set-webkit-configuration, because that's where
+ we verify that CreatedByBuildSystem is set on the build directory.
+ Don't pass -EnableBuildDebugging=1; it's not actually needed to enable
+ dependency validation.
+
2022-04-07 Martin Robinson <mrobin...@webkit.org>
[GTK] Turning on the address sanitizer should disable GIR and documentation
Modified: trunk/Makefile.shared (292590 => 292591)
--- trunk/Makefile.shared 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Makefile.shared 2022-04-08 04:09:07 UTC (rev 292591)
@@ -97,11 +97,6 @@
CONFIG_OPTIONS += --lto-mode=none
endif
-ifeq (YES,$(findstring YES,$(VALIDATE_DEPENDENCIES)))
-CONFIG_OPTIONS += --validate-dependencies
-XCODE_OPTIONS += -EnableBuildDebugging=1 VALIDATE_DEPENDENCIES=$(VALIDATE_DEPENDENCIES)
-endif
-
export DSYMUTIL_NUM_THREADS = $(shell sysctl -n hw.activecpu)
# Run xcodebuild with the same PATH with which the Xcode IDE runs, to mitigate unnecessary rebuilds due to PATH differences.
@@ -124,9 +119,7 @@
endef
all:
-ifneq (,$(CONFIG_OPTIONS))
@$(call set_webkit_configuration,)
-endif
@$(call invoke_xcode,,,GCC_PREPROCESSOR_DEFINITIONS='$(GCC_PREPROCESSOR_ADDITIONS) $$(inherited)')
debug d: force
Modified: trunk/Source/_javascript_Core/ChangeLog (292590 => 292591)
--- trunk/Source/_javascript_Core/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Geza Lore <gl...@igalia.com>
[JSC][ARMv7] Support proper near calls and JUMP_ISLANDS
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -40,6 +40,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (292590 => 292591)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-05 Kimmo Kinnunen <kkinnu...@apple.com>
ANGLE changes.diff contains differences that are from stale files or unneeded
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -12,6 +12,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (292590 => 292591)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-06 Youenn Fablet <you...@apple.com>
[Cocoa] Use GCD webrtc task queue
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -36,6 +36,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WTF/ChangeLog (292590 => 292591)
--- trunk/Source/WTF/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WTF/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Sam Sneddon <gsnedd...@apple.com>
Move long-enabled preferences away from experimental
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -34,6 +34,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
Modified: trunk/Source/WebCore/ChangeLog (292590 => 292591)
--- trunk/Source/WebCore/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebCore/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Chris Dumez <cdu...@apple.com>
Add PAL::TextEncoding() constructor that takes in a StringView
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -35,6 +35,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebCore/PAL/ChangeLog (292590 => 292591)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Chris Dumez <cdu...@apple.com>
Add PAL::TextEncoding() constructor that takes in a StringView
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -35,6 +35,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebGPU/ChangeLog (292590 => 292591)
--- trunk/Source/WebGPU/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebGPU/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Myles C. Maxfield <mmaxfi...@apple.com>
[WebGPU] Add support for the "is valid to use with" operation to WebGPU objects
Modified: trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -35,6 +35,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebInspectorUI/ChangeLog (292590 => 292591)
--- trunk/Source/WebInspectorUI/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebInspectorUI/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-05 Patrick Angle <pan...@apple.com>
Web Inspector: Regression(r291729) The result of logging $0 to the console shows overlapping `$0` and `$[n]` after the node
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -12,6 +12,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
COMBINE_INSPECTOR_RESOURCES = NO;
COMBINE_TEST_RESOURCES = YES;
Modified: trunk/Source/WebKit/ChangeLog (292590 => 292591)
--- trunk/Source/WebKit/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebKit/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Stephan Szabo <stephan.sz...@sony.com>
[WinCairo] Fix DrawingAreaWC after r292557
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -40,6 +40,8 @@
CODE_SIGN_IDENTITY_NO = -;
CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_XPC_SERVICE_SUFFIX[sdk=macosx*] = .Development;
WK_XPC_SERVICE_SUFFIX[sdk=*simulator*] = .Development;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (292590 => 292591)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-07 Chris Dumez <cdu...@apple.com>
Replace deprecated String(const char*) with String::fromLatin1() in more places
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -35,6 +35,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_BUILD_FOR_TESTING = YES;
WK_RELOCATABLE_FRAMEWORKS = YES;
Modified: trunk/Source/bmalloc/ChangeLog (292590 => 292591)
--- trunk/Source/bmalloc/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/bmalloc/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,13 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Configurations/DebugRelease.xcconfig:
+
2022-04-06 Yusuke Suzuki <ysuz...@apple.com>
[libpas] Run TLC decommit rarely
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -34,6 +34,8 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
Modified: trunk/Tools/ChangeLog (292590 => 292591)
--- trunk/Tools/ChangeLog 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/ChangeLog 2022-04-08 04:09:07 UTC (rev 292591)
@@ -1,3 +1,27 @@
+2022-04-07 Elliott Williams <e...@apple.com>
+
+ [XCBuild] Enable dependency validation by default
+ https://bugs.webkit.org/show_bug.cgi?id=238901
+ <rdar://problem/91379968>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * ImageDiff/cg/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * MobileMiniBrowser/Configurations/DebugRelease.xcconfig:
+ * Scripts/build-webkit:
+ * Scripts/set-webkit-configuration: When run with no arguments, checks
+ the base product directory, prints the configuration, and exits.
+ Recognizes -h and --help flags to show usage.
+ * Scripts/webkitdirs.pm:
+ (markBaseProductDirectoryAsCreatedByXcodeBuildSystem): New name of
+ setCreatedByXcodeBuildSystem.
+ (setCreatedByXcodeBuildSystem): Renamed.
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ * lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig:
+
2022-04-07 Chris Dumez <cdu...@apple.com>
Replace deprecated String(const char*) with String::fromLatin1() in more places
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -37,5 +37,7 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include "../../../ccache/ccache.xcconfig"
Modified: trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -30,3 +30,5 @@
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+
+VALIDATE_DEPENDENCIES = YES_ERROR;
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -34,5 +34,7 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include? "../../ccache/ccache.xcconfig"
Modified: trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/MobileMiniBrowser/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -30,5 +30,7 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include "../../ccache/ccache.xcconfig"
Modified: trunk/Tools/Scripts/build-webkit (292590 => 292591)
--- trunk/Tools/Scripts/build-webkit 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/Scripts/build-webkit 2022-04-08 04:09:07 UTC (rev 292591)
@@ -354,6 +354,8 @@
push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
push @local_options, "WK_LTO_MODE=$ltoMode" if ($ltoMode ne "default");
+
+ markBaseProductDirectoryAsCreatedByXcodeBuildSystem();
# Build, and abort if the build fails.
if ($useWorkspace) {
Modified: trunk/Tools/Scripts/set-webkit-configuration (292590 => 292591)
--- trunk/Tools/Scripts/set-webkit-configuration 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/Scripts/set-webkit-configuration 2022-04-08 04:09:07 UTC (rev 292591)
@@ -28,6 +28,7 @@
use strict;
use warnings;
+use File::Path qw(make_path);
use File::Spec;
use FindBin;
use lib $FindBin::Bin;
@@ -46,8 +47,8 @@
--lto-mode=<mode> Set LTO mode: full, thin, or none
--debug Set the default configuration to debug
--release Set the default configuration to release
- --validate-dependencies Configure the build directory for Xcode dependency validation
--reset Reset configurations
+ -h, --help Show this message and exit
EOF
sub printCurrentSettings();
@@ -64,7 +65,6 @@
my $disableUBSAN = checkForArgumentAndRemoveFromARGV("--no-ubsan");
my $enableCoverage = checkForArgumentAndRemoveFromARGV("--coverage");
my $disableCoverage = checkForArgumentAndRemoveFromARGV("--no-coverage");
-my $validateDependencies = checkForArgumentAndRemoveFromARGV("--validate-dependencies");
my $ltoMode;
if (!checkForArgumentAndRemoveFromARGVGettingValue("--lto-mode", \$ltoMode)) {
$ltoMode="";
@@ -75,6 +75,11 @@
$forceOptimizationLevel="";
}
+if (checkForArgumentAndRemoveFromARGV("-h") || checkForArgumentAndRemoveFromARGV("--help")) {
+ printUsage();
+ exit 1;
+}
+
if (!$architecture) {
# Handle --64-bit explicitly here, as we don't want our other scripts to accept it
for my $i (0 .. $#ARGV) {
@@ -87,7 +92,11 @@
}
my $baseProductDir = baseProductDir();
-system "mkdir", "-p", "$baseProductDir";
+if (isAppleCocoaWebKit() && !isCMakeBuild()) {
+ markBaseProductDirectoryAsCreatedByXcodeBuildSystem();
+} else {
+ make_path($baseProductDir);
+}
if (checkForArgumentAndRemoveFromARGV("--reset")) {
for my $fileName (qw(Architecture ASan Configuration Coverage ForceOptimizationLevel LTO TSan UBSan)) {
@@ -97,16 +106,6 @@
exit 0;
}
-if ((!$configuration && !$architecture && !$enableASAN && !$disableASAN && !$enableCoverage && !$disableCoverage && !$enableTSAN && !$disableTSAN && !$enableUBSAN && !$disableUBSAN && !$ltoMode && !$forceOptimizationLevel)
- || ($enableASAN && $disableASAN)
- || ($enableCoverage && $disableCoverage)
- || ($enableTSAN && $disableTSAN)
- || ($enableUBSAN && $disableUBSAN)
- ) {
- printUsage();
- exit 1;
-}
-
if ($enableASAN && $enableTSAN) {
print STDERR "ERROR: Address Sanitizer and Thread Sanitzer can't be enabled together.\n";
printUsage();
@@ -166,10 +165,6 @@
close LTO;
}
-if ($validateDependencies) {
- setCreatedByXcodeBuildSystem();
-}
-
printCurrentSettings();
exit 0;
Modified: trunk/Tools/Scripts/webkitdirs.pm (292590 => 292591)
--- trunk/Tools/Scripts/webkitdirs.pm 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/Scripts/webkitdirs.pm 2022-04-08 04:09:07 UTC (rev 292591)
@@ -341,7 +341,7 @@
($baseProductDir) = @_;
}
-sub setCreatedByXcodeBuildSystem
+sub markBaseProductDirectoryAsCreatedByXcodeBuildSystem
{
determineBaseProductDir();
make_path($baseProductDir);
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -36,6 +36,8 @@
OTHER_CPLUSPLUSFLAGS = $(inherited) -ftemplate-depth=256;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -32,5 +32,7 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include "../../ccache/ccache.xcconfig"
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (292590 => 292591)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2022-04-08 04:06:57 UTC (rev 292590)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2022-04-08 04:09:07 UTC (rev 292591)
@@ -32,5 +32,7 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
+VALIDATE_DEPENDENCIES = YES_ERROR;
+
WK_CCACHE_DIR = $(SRCROOT)/../../../Tools/ccache;
#include "../../../ccache/ccache.xcconfig"
