Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
458463003:
DevTools: Sort build file contents (Closed)
|
Created:
6 years, 4 months ago by apavlov Modified:
6 years, 4 months ago CC:
blink-reviews, caseq+blink_chromium.org, loislo+blink_chromium.org, eustas+blink_chromium.org, malch+blink_chromium.org, yurys+blink_chromium.org, lushnikov+blink_chromium.org, vsevik+blink_chromium.org, pfeldman+blink_chromium.org, paulirish+reviews_chromium.org, apavlov+blink_chromium.org, devtools-reviews_chromium.org, sergeyv+blink_chromium.org, aandrey+blink_chromium.org Base URL:
svn://svn.chromium.org/blink/trunk Project:
blink Visibility:
Public. |
DescriptionDevTools: Sort build file contents
devtools.gyp* contents ordering is highly confusing, and it usually
takes some time to find certain snippets when modifying the deployment setup.
TBR=vsevik
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=179921
Patch Set 1 #Patch Set 2 : Rebased patch #Patch Set 3 : Revert the treeoutline.js rename due to win issues #
Messages
Total messages: 22 (0 generated)
The CQ bit was checked by apavlov@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/apavlov@chromium.org/458463003/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for Source/devtools/devtools.gypi:
While running patch -p1 --forward --force --no-backup-if-mismatch;
patching file Source/devtools/devtools.gypi
Hunk #15 FAILED at 455.
Hunk #16 succeeded at 552 (offset 2 lines).
Hunk #17 succeeded at 593 (offset 2 lines).
Hunk #18 succeeded at 635 (offset 2 lines).
1 out of 18 hunks FAILED -- saving rejects to file
Source/devtools/devtools.gypi.rej
Patch: Source/devtools/devtools.gypi
Index: Source/devtools/devtools.gypi
diff --git a/Source/devtools/devtools.gypi b/Source/devtools/devtools.gypi
index
b578c6a7cfe309aaa02225e8dacf1040444e1b7e..76645276db6c7d9b4ef6403b34730ffa006f9072
100644
--- a/Source/devtools/devtools.gypi
+++ b/Source/devtools/devtools.gypi
@@ -33,15 +33,15 @@
# If debug_devtools is set to 1, JavaScript files for DevTools are
# stored as is. Otherwise, a concatenated file is stored.
'debug_devtools%': 0,
- 'devtools_core_js_files': [
+ 'devtools_core_files': [
'<@(devtools_core_base_files)',
'<@(devtools_common_js_files)',
- '<@(devtools_sdk_js_files)',
- '<@(devtools_ui_js_files)',
'<@(devtools_components_js_files)',
'<@(devtools_host_js_files)',
'<@(devtools_screencast_js_files)',
+ '<@(devtools_sdk_js_files)',
'<@(devtools_toolbox_js_files)',
+ '<@(devtools_ui_js_files)',
],
'devtools_core_base_files': [
'front_end/inspector.html',
@@ -62,12 +62,12 @@
],
'devtools_common_js_files': [
'front_end/common/Color.js',
- 'front_end/common/Geometry.js',
'front_end/common/Console.js',
+ 'front_end/common/Geometry.js',
'front_end/common/ModuleExtensionInterfaces.js',
'front_end/common/modules.js',
- 'front_end/common/Object.js',
'front_end/common/NotificationService.js',
+ 'front_end/common/Object.js',
'front_end/common/ParsedURL.js',
'front_end/common/Progress.js',
'front_end/common/Settings.js',
@@ -78,9 +78,46 @@
'front_end/common/utilities.js',
'front_end/common/WebInspector.js',
],
+ 'devtools_components_js_files': [
+ 'front_end/components/CookiesTable.js',
+ 'front_end/components/DockController.js',
+ 'front_end/components/DOMBreakpointsSidebarPane.js',
+ 'front_end/components/DOMPresentationUtils.js',
+ 'front_end/components/Drawer.js',
+ 'front_end/components/ExecutionContextSelector.js',
+ 'front_end/components/ExtensionServerProxy.js',
+ 'front_end/components/FilterBar.js',
+ 'front_end/components/FilterSuggestionBuilder.js',
+ 'front_end/components/FlameChart.js',
+ 'front_end/components/HandlerRegistry.js',
+ 'front_end/components/HelpScreen.js',
+ 'front_end/components/InspectElementModeController.js',
+ 'front_end/components/InspectorView.js',
+ 'front_end/components/NativeBreakpointsSidebarPane.js',
+ 'front_end/components/ObjectPopoverHelper.js',
+ 'front_end/components/ObjectPropertiesSection.js',
+ 'front_end/components/OverviewGrid.js',
+ 'front_end/components/Panel.js',
+ 'front_end/components/PropertiesSection.js',
+ 'front_end/components/SearchableView.js',
+ 'front_end/components/Section.js',
+ 'front_end/components/ShortcutsScreen.js',
+ 'front_end/components/TargetsComboBoxController.js',
+ 'front_end/components/TimelineGrid.js',
+ 'front_end/components/WorkerFrontendManager.js',
+ ],
+ 'devtools_host_js_files': [
+ 'front_end/host/InspectorFrontendHost.js',
+ 'front_end/host/Platform.js',
+ 'front_end/host/UserMetrics.js',
+ ],
+ 'devtools_screencast_js_files': [
+ 'front_end/screencast/ScreencastView.js',
+ ],
'devtools_sdk_js_files': [
'front_end/sdk/ApplicationCacheModel.js',
'front_end/sdk/BlackboxSupport.js',
+ 'front_end/sdk/BreakpointManager.js',
'front_end/sdk/CompilerScriptMapping.js',
'front_end/sdk/ConsoleModel.js',
'front_end/sdk/ContentProvider.js',
@@ -93,23 +130,22 @@
'front_end/sdk/CSSParser.js',
'front_end/sdk/CSSStyleModel.js',
'front_end/sdk/CSSWorkspaceBinding.js',
- 'front_end/sdk/BreakpointManager.js',
- 'front_end/sdk/DOMModel.js',
- 'front_end/sdk/DOMStorage.js',
'front_end/sdk/Database.js',
'front_end/sdk/DebuggerModel.js',
'front_end/sdk/DebuggerWorkspaceBinding.js',
'front_end/sdk/DefaultScriptMapping.js',
+ 'front_end/sdk/DOMModel.js',
+ 'front_end/sdk/DOMStorage.js',
'front_end/sdk/FileManager.js',
'front_end/sdk/FileSystemMapping.js',
'front_end/sdk/FileSystemModel.js',
'front_end/sdk/FileSystemWorkspaceBinding.js',
'front_end/sdk/FileUtils.js',
+ 'front_end/sdk/HeapProfilerModel.js',
'front_end/sdk/IndexedDBModel.js',
'front_end/sdk/InspectorBackend.js',
- 'front_end/sdk/IsolatedFileSystemManager.js',
'front_end/sdk/IsolatedFileSystem.js',
- 'front_end/sdk/HeapProfilerModel.js',
+ 'front_end/sdk/IsolatedFileSystemManager.js',
'front_end/sdk/LayerTreeModel.js',
'front_end/sdk/Linkifier.js',
'front_end/sdk/LiveEditSupport.js',
@@ -146,6 +182,12 @@
'front_end/sdk/Workspace.js',
'front_end/sdk/WorkspaceController.js',
],
+ 'devtools_toolbox_js_files': [
+ 'front_end/toolbox/InspectedPagePlaceholder.js',
+ 'front_end/toolbox/MediaQueryInspector.js',
+ 'front_end/toolbox/OverridesUI.js',
+ 'front_end/toolbox/ResponsiveDesignView.js',
+ ],
'devtools_ui_js_files': [
'front_end/ui/ActionRegistry.js',
'front_end/ui/Checkbox.js',
@@ -166,10 +208,10 @@
'front_end/ui/ResizerWidget.js',
'front_end/ui/RootView.js',
'front_end/ui/SettingsUI.js',
- 'front_end/ui/SidebarPane.js',
- 'front_end/ui/SidebarTreeElement.js',
'front_end/ui/ShortcutRegistry.js',
'front_end/ui/ShowMoreDataGridNode.js',
+ 'front_end/ui/SidebarPane.js',
+ 'front_end/ui/SidebarTreeElement.js',
'front_end/ui/SoftContextMenu.js',
'front_end/ui/SortableDataGrid.js',
'front_end/ui/SplitView.js',
@@ -179,68 +221,28 @@
'front_end/ui/TabbedPane.js',
'front_end/ui/TextEditor.js',
'front_end/ui/TextPrompt.js',
+ 'front_end/ui/TreeOutline.js',
'front_end/ui/UIUtils.js',
'front_end/ui/View.js',
'front_end/ui/ViewportControl.js',
'front_end/ui/ZoomManager.js',
- 'front_end/ui/treeoutline.js',
- ],
- 'devtools_components_js_files': [
- 'front_end/components/CookiesTable.js',
- 'front_end/components/DockController.js',
- 'front_end/components/Drawer.js',
- 'front_end/components/DOMBreakpointsSidebarPane.js',
- 'front_end/components/DOMPresentationUtils.js',
- 'front_end/components/ExecutionContextSelector.js',
- 'front_end/components/ExtensionServerProxy.js',
- 'front_end/components/FilterBar.js',
- 'front_end/components/FilterSuggestionBuilder.js',
- 'front_end/components/FlameChart.js',
- 'front_end/components/HandlerRegistry.js',
- 'front_end/components/HelpScreen.js',
- 'front_end/components/InspectElementModeController.js',
- 'front_end/components/InspectorView.js',
- 'front_end/components/NativeBreakpointsSidebarPane.js',
- 'front_end/components/ObjectPopoverHelper.js',
- 'front_end/components/ObjectPropertiesSection.js',
- 'front_end/components/OverviewGrid.js',
- 'front_end/components/Panel.js',
- 'front_end/components/PropertiesSection.js',
- 'front_end/components/SearchableView.js',
- 'front_end/components/Section.js',
- 'front_end/components/ShortcutsScreen.js',
- 'front_end/components/TimelineGrid.js',
- 'front_end/components/WorkerFrontendManager.js',
- 'front_end/components/TargetsComboBoxController.js',
- ],
- 'devtools_host_js_files': [
- 'front_end/host/InspectorFrontendHost.js',
- 'front_end/host/Platform.js',
- 'front_end/host/UserMetrics.js',
- ],
- 'devtools_screencast_js_files': [
- 'front_end/screencast/ScreencastView.js',
- ],
- 'devtools_toolbox_js_files': [
- 'front_end/toolbox/InspectedPagePlaceholder.js',
- 'front_end/toolbox/MediaQueryInspector.js',
- 'front_end/toolbox/OverridesUI.js',
- 'front_end/toolbox/ResponsiveDesignView.js',
],
'devtools_main_js_files': [
'front_end/main/AdvancedApp.js',
'front_end/main/App.js',
'front_end/main/HelpScreenUntilReload.js',
+ 'front_end/main/Main.js',
'front_end/main/OverridesView.js',
'front_end/main/RenderingOptions.js',
'front_end/main/ScreencastApp.js',
'front_end/main/SimpleApp.js',
- 'front_end/main/Main.js',
],
+
'dev…
(message too large)
The CQ bit was checked by apavlov@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/apavlov@chromium.org/458463003/20001
The CQ bit was unchecked by apavlov@chromium.org
The CQ bit was checked by apavlov@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/apavlov@chromium.org/458463003/20001
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: mac_blink_compile_dbg on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/mac_blink_compile_dbg/bu...) mac_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/19045) win_blink_compile_dbg on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/win_blink_compile_dbg/bu...) win_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/21786) mac_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/39175) win_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/win_gpu/builds/44406)
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: mac_blink_compile_dbg on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/mac_blink_compile_dbg/bu...) mac_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/19058) mac_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/39212)
The CQ bit was checked by apavlov@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/apavlov@chromium.org/458463003/40001
The CQ bit was unchecked by apavlov@chromium.org
lgtm
The CQ bit was checked by apavlov@chromium.org
The CQ bit was unchecked by apavlov@chromium.org
The CQ bit was checked by apavlov@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/apavlov@chromium.org/458463003/40001
Message was sent while issue was closed.
Change committed as 179921 |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
