Title: [272222] trunk/Source/_javascript_Core
- Revision
- 272222
- Author
- [email protected]
- Date
- 2021-02-02 10:43:27 -0800 (Tue, 02 Feb 2021)
Log Message
REGRESSION(r269309): [Cocoa] RemoteInspectorCocoa files are being compiled twice
https://bugs.webkit.org/show_bug.cgi?id=220951
<rdar://problem/73848263>
Patch by Don Olmstead <[email protected]> on 2021-02-02
Reviewed by BJ Burg.
Refactor our SourcesCocoa files in _javascript_Core to avoid double-listing
or double-building remote inspection-related files. Properly track
inspector/remote/SourcesCocoa.txt as a build dependency.
* _javascript_Core.xcodeproj/project.pbxproj:
* Scripts/generate-unified-sources.sh:
* SourcesCocoa.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (272221 => 272222)
--- trunk/Source/_javascript_Core/ChangeLog 2021-02-02 18:30:42 UTC (rev 272221)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-02-02 18:43:27 UTC (rev 272222)
@@ -1,3 +1,19 @@
+2021-02-02 Don Olmstead <[email protected]>
+
+ REGRESSION(r269309): [Cocoa] RemoteInspectorCocoa files are being compiled twice
+ https://bugs.webkit.org/show_bug.cgi?id=220951
+ <rdar://problem/73848263>
+
+ Reviewed by BJ Burg.
+
+ Refactor our SourcesCocoa files in _javascript_Core to avoid double-listing
+ or double-building remote inspection-related files. Properly track
+ inspector/remote/SourcesCocoa.txt as a build dependency.
+
+ * _javascript_Core.xcodeproj/project.pbxproj:
+ * Scripts/generate-unified-sources.sh:
+ * SourcesCocoa.txt:
+
2021-02-02 Xan Lopez <[email protected]>
[JSC] Small cleanup in StackVisitor::readNonInlinedFrame
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (272221 => 272222)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2021-02-02 18:30:42 UTC (rev 272221)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2021-02-02 18:43:27 UTC (rev 272222)
@@ -4335,6 +4335,7 @@
996B73151BDA05AA00331B84 /* ArrayConstructor.lut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrayConstructor.lut.h; sourceTree = "<group>"; };
998ED6721BED659A00DD8017 /* RemoteControllableTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteControllableTarget.cpp; sourceTree = "<group>"; };
998ED6731BED659A00DD8017 /* RemoteControllableTarget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteControllableTarget.h; sourceTree = "<group>"; };
+ 99A3273825C9CBEE00DA8CAF /* SourcesCocoa.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = SourcesCocoa.txt; sourceTree = "<group>"; };
99DA00991BD5992700F4575C /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
99DA009A1BD5992700F4575C /* builtins_generator.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generator.py; sourceTree = "<group>"; };
99DA009B1BD5992700F4575C /* builtins_model.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_model.py; sourceTree = "<group>"; };
@@ -8781,6 +8782,7 @@
995566851E4E8B0700AAE13C /* RemoteInspector.cpp */,
A5BA15E1182340B300A82E69 /* RemoteInspector.h */,
A5BA15E3182340B300A82E69 /* RemoteInspectorConstants.h */,
+ 99A3273825C9CBEE00DA8CAF /* SourcesCocoa.txt */,
);
path = remote;
sourceTree = "<group>";
@@ -11156,6 +11158,7 @@
"$(SRCROOT)/Scripts/generate-unified-sources.sh",
"$(SRCROOT)/Sources.txt",
"$(SRCROOT)/SourcesCocoa.txt",
+ "$(SRCROOT)/inspector/remote/SourcesCocoa.txt",
);
name = "Generate Unified Sources";
outputFileListPaths = (
Modified: trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh (272221 => 272222)
--- trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2021-02-02 18:30:42 UTC (rev 272221)
+++ trunk/Source/_javascript_Core/Scripts/generate-unified-sources.sh 2021-02-02 18:43:27 UTC (rev 272222)
@@ -18,7 +18,7 @@
UnifiedSourceMmFileCount=5
if [ $# -eq 0 ]; then
- echo "Using unified source list files: Sources.txt, SourcesCocoa.txt"
+ echo "Using unified source list files: Sources.txt, SourcesCocoa.txt, inspector/remote/SourcesCocoa.txt"
fi
-/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt "${ARGS[@]}" > /dev/null
+/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt inspector/remote/SourcesCocoa.txt "${ARGS[@]}" > /dev/null
Modified: trunk/Source/_javascript_Core/SourcesCocoa.txt (272221 => 272222)
--- trunk/Source/_javascript_Core/SourcesCocoa.txt 2021-02-02 18:30:42 UTC (rev 272221)
+++ trunk/Source/_javascript_Core/SourcesCocoa.txt 2021-02-02 18:43:27 UTC (rev 272222)
@@ -34,11 +34,4 @@
API/JSWrapperMap.mm
API/ObjCCallbackFunction.mm
-inspector/remote/RemoteAutomationTarget.cpp
-inspector/remote/RemoteControllableTarget.cpp
-inspector/remote/RemoteInspectionTarget.cpp
-inspector/remote/RemoteInspector.cpp
-
-inspector/remote/cocoa/RemoteConnectionToTargetCocoa.mm
-inspector/remote/cocoa/RemoteInspectorCocoa.mm
-inspector/remote/cocoa/RemoteInspectorXPCConnection.mm
+// Use inspector/remote/SourcesCocoa.txt for Remote Inspector files
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
