Diff
Modified: trunk/ChangeLog (290178 => 290179)
--- trunk/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Ryosuke Niwa <rn...@webkit.org>
Replace trac URLs in Introduction.md by equivalent GitHub URLs
Modified: trunk/Makefile.shared (290178 => 290179)
--- trunk/Makefile.shared 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Makefile.shared 2022-02-19 00:03:05 UTC (rev 290179)
@@ -47,13 +47,6 @@
endif
endif
-ifneq (,$(EXPORT_COMPILE_COMMANDS))
- XCODE_OPTIONS += EXPORT_COMPILE_COMMANDS=YES
- XCODE_OPTIONS += GCC_PRECOMPILE_PREFIX_HEADER=NO
- XCODE_OPTIONS += CLANG_ENABLE_MODULE_DEBUGGING=NO
- XCODE_OPTIONS += COMPILER_INDEX_STORE_ENABLE=NO
-endif
-
DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
VERBOSITY ?= $(DEFAULT_VERBOSITY)
Modified: trunk/PerformanceTests/ChangeLog (290178 => 290179)
--- trunk/PerformanceTests/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/PerformanceTests/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/PerformanceTests/DecoderTest/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
Modified: trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/PerformanceTests/MediaTime/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -32,6 +32,3 @@
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
Modified: trunk/Source/_javascript_Core/ChangeLog (290178 => 290179)
--- trunk/Source/_javascript_Core/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/_javascript_Core/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/_javascript_Core/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -40,9 +40,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (290178 => 290179)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -12,9 +12,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (290178 => 290179)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Elliott Williams <e...@apple.com>
[XCBuild] "All Modules" workspace builds building out of order
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -36,9 +36,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WTF/ChangeLog (290178 => 290179)
--- trunk/Source/WTF/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WTF/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Eric Carlson <eric.carl...@apple.com>
[macOS] Allow screen and window capture to be done in the GPU Process
Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -34,9 +34,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
Modified: trunk/Source/WebCore/ChangeLog (290178 => 290179)
--- trunk/Source/WebCore/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebCore/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Wenson Hsieh <wenson_hs...@apple.com>
[Live Text] Add a mechanism to inject images into image overlays
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebCore/PAL/ChangeLog (290178 => 290179)
--- trunk/Source/WebCore/PAL/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebCore/PAL/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Elliott Williams <e...@apple.com>
[XCBuild] "All Modules" workspace builds building out of order
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebGPU/ChangeLog (290178 => 290179)
--- trunk/Source/WebGPU/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebGPU/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Elliott Williams <e...@apple.com>
[XCBuild] "All Modules" workspace builds building out of order
Modified: trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebGPU/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_RELOCATABLE_FRAMEWORKS = YES;
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
Modified: trunk/Source/WebInspectorUI/ChangeLog (290178 => 290179)
--- trunk/Source/WebInspectorUI/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebInspectorUI/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -12,9 +12,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
COMBINE_INSPECTOR_RESOURCES = NO;
COMBINE_TEST_RESOURCES = YES;
Modified: trunk/Source/WebKit/ChangeLog (290178 => 290179)
--- trunk/Source/WebKit/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebKit/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Kimmo Kinnunen <kkinnu...@apple.com>
WebGL GPUP: Crash when running fast/mediastream/getUserMedia-to-canvas-1.html
Modified: trunk/Source/WebKit/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebKit/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
CODE_SIGN_IDENTITY[sdk=macosx*] = $(CODE_SIGN_IDENTITY_$(WK_USE_RESTRICTED_ENTITLEMENTS))
CODE_SIGN_IDENTITY_ = $(CODE_SIGN_IDENTITY_NO);
CODE_SIGN_IDENTITY_NO = -;
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPageUIClient.h (290178 => 290179)
--- trunk/Source/WebKit/UIProcess/API/C/WKPageUIClient.h 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPageUIClient.h 2022-02-19 00:03:05 UTC (rev 290179)
@@ -135,8 +135,8 @@
typedef void (*WKPageDidResignInputElementStrongPasswordAppearanceCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
typedef bool (*WKPageShouldAllowDeviceOrientationAndMotionAccessCallback)(WKPageRef page, WKSecurityOriginRef securityOrigin, WKFrameInfoRef frame, const void *clientInfo);
-typedef void (*WKPageRunWebAuthenticationPanelCallback)(void);
-typedef void (*WKPageRequestWebAuthenticationNoGestureCallback)(void);
+typedef void (*WKPageRunWebAuthenticationPanelCallback)();
+typedef void (*WKPageRequestWebAuthenticationNoGestureCallback)();
typedef void (*WKPageDecidePolicyForSpeechRecognitionPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef topOrigin, WKSpeechRecognitionPermissionCallbackRef callback);
typedef void (*WKPageDecidePolicyForMediaKeySystemPermissionRequestCallback)(WKPageRef page, WKSecurityOriginRef topOrigin, WKStringRef keySystem, WKMediaKeySystemPermissionCallbackRef callback);
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (290178 => 290179)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/WebKitLegacy/mac/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -35,9 +35,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_BUILD_FOR_TESTING = YES;
WK_RELOCATABLE_FRAMEWORKS = YES;
Modified: trunk/Source/bmalloc/ChangeLog (290178 => 290179)
--- trunk/Source/bmalloc/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/bmalloc/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Brandon Stewart <brandonstew...@apple.com>
Generate compile_commands.json on macOS Builds
Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -34,9 +34,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_DEFAULT_LTO_MODE = $(WK_USER_LTO_MODE_none);
WK_CCACHE_DIR = $(SRCROOT)/../../Tools/ccache;
Modified: trunk/Tools/ChangeLog (290178 => 290179)
--- trunk/Tools/ChangeLog 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/ChangeLog 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,3 +1,15 @@
+2022-02-18 Robert Jenner <jen...@apple.com>
+
+ Unreviewed, reverting r290149.
+
+ Broke Debug Builds.
+
+ Reverted changeset:
+
+ "Generate compile_commands.json on macOS Builds"
+ https://bugs.webkit.org/show_bug.cgi?id=235686
+ https://commits.webkit.org/r290149
+
2022-02-18 Elliott Williams <e...@apple.com>
[XCBuild] "All Modules" workspace builds building out of order
Modified: trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -31,6 +31,3 @@
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -37,8 +37,5 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include "../../../ccache/ccache.xcconfig"
Modified: trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/ImageDiff/cg/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -30,6 +30,3 @@
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -34,8 +34,5 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include? "../../ccache/ccache.xcconfig"
Modified: trunk/Tools/Scripts/build-jsc (290178 => 290179)
--- trunk/Tools/Scripts/build-jsc 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/Scripts/build-jsc 2022-02-19 00:03:05 UTC (rev 290179)
@@ -61,7 +61,6 @@
my $buildDir = "";
my $startTime = time();
my $useCCache = -1;
-my $exportCompileCommands = 0;
my @features = getFeatureOptionList();
@@ -94,7 +93,6 @@
--build-dir=<path> Build out of tree in directory at <path>
--[no-]use-ccache Enable (or disable) CCache, if available
- --export-compile-commands Generate compile_commands.json (Apple platforms only)
EOF
my %options = (
@@ -107,8 +105,7 @@
'makeargs=s' => \$makeArgs,
'cmakeargs=s' => \@cmakeArgs,
'build-dir=s' => \$buildDir,
- 'use-ccache!' => \$useCCache,
- 'export-compile-commands' => \$exportCompileCommands
+ 'use-ccache!' => \$useCCache
);
foreach (@features) {
@@ -145,8 +142,6 @@
$ENV{'WK_USE_CCACHE'} = "NO";
}
-$ENV{'EXPORT_COMPILE_COMMANDS'} = "YES" if $exportCompileCommands;
-
checkRequiredSystemConfig();
setConfiguration();
chdirWebKit();
Modified: trunk/Tools/Scripts/build-webkit (290178 => 290179)
--- trunk/Tools/Scripts/build-webkit 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/Scripts/build-webkit 2022-02-19 00:03:05 UTC (rev 290179)
@@ -80,7 +80,6 @@
my $archs32bit = 0;
my $skipLibraryUpdate = 0;
my $useCCache = -1;
-my $exportCompileCommands = 0;
my @features = getFeatureOptionList();
@@ -147,8 +146,6 @@
--[no-]use-ccache Enable (or disable) CCache, if available
- --export-compile-commands Generate compile_commands.json (Apple platforms only)
-
EOF
my %options = (
@@ -170,7 +167,6 @@
'use-workspace!' => \$useWorkspace,
'skip-library-update' => \$skipLibraryUpdate,
'use-ccache!' => \$useCCache,
- 'export-compile-commands' => \$exportCompileCommands
);
# Build usage text and options list from features
@@ -195,7 +191,6 @@
$ENV{'WK_USE_CCACHE'} = "NO";
}
-$ENV{'EXPORT_COMPILE_COMMANDS'} = "YES" if $exportCompileCommands;
my $productDir = productDir();
Deleted: trunk/Tools/Scripts/generate-compile-commands (290178 => 290179)
--- trunk/Tools/Scripts/generate-compile-commands 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/Scripts/generate-compile-commands 2022-02-19 00:03:05 UTC (rev 290179)
@@ -1,60 +0,0 @@
-#!/bin/sh -e
-
-# Copyright (C) 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.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
-
-# Script to generate compile_commands.json file
-
-# Change to the root of WebKit Directory
-cd "$(dirname "$0")/../../"
-
-# Check compile_commands folder exists
-if ! [ -d $1/compile_commands/ ]; then
- echo "Please specify the build directory with compile_commands."
- echo "Example: generate-compile-commands WebKitBuild/Release"
- exit 1
-fi
-
-# Remove any previous compile_commands.json
-rm -f compile_commands.json
-
-# Generate compile_commands.json
-echo "[" > compile_commands.json
-awk '{print}' $1/compile_commands/*.json >> compile_commands.json
-
-# Remove last comma
-sed -i '' '$ s/,$//' compile_commands.json
-
-echo "]" >> compile_commands.json
-
-# Workaround issue where clangd fails with -gmodules flag
-sed -i '' 's/"-gmodules"/"-Xclang -fmodule-format=raw"/g' compile_commands.json
-
-# Remove ThirdParty components from indexing
-# This is quite large and probably unnecessary for most.
-sed -i '' '/Source\/ThirdParty/d' compile_commands.json
-
-echo "Generated compile_commands.json"
\ No newline at end of file
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -34,9 +34,6 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
OTHER_CPLUSPLUSFLAGS = $(inherited) -ftemplate-depth=256;
WK_RELOCATABLE_FRAMEWORKS = YES;
Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -32,6 +32,3 @@
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -32,8 +32,5 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_CCACHE_DIR = $(SRCROOT)/../ccache;
#include "../../ccache/ccache.xcconfig"
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig (290178 => 290179)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2022-02-18 23:50:27 UTC (rev 290178)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/DebugRelease.xcconfig 2022-02-19 00:03:05 UTC (rev 290179)
@@ -32,8 +32,5 @@
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
-OTHER_CFLAGS = $(inherited) $(COMPILE_COMMANDS_$(EXPORT_COMPILE_COMMANDS));
-COMPILE_COMMANDS_YES = '-gen-cdb-fragment-path' '$(BUILT_PRODUCTS_DIR)/compile_commands';
-
WK_CCACHE_DIR = $(SRCROOT)/../../../Tools/ccache;
#include "../../../ccache/ccache.xcconfig"
