Changeset 101191 in webkit

Timestamp:

Nov 26, 2011 2:47:48 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[CMake] Clean up Web Inspector target in Source/WebKit/blackberry/CMakeListsBlackBerry.txt
​https://bugs.webkit.org/show_bug.cgi?id=72784

Patch by Jonathan Dong <Jonathan Dong> on 2011-11-26
Reviewed by Nikolas Zimmermann.

Abstracted the JavaScript file names from inspector/front-end/inspector.html
to keep them in-sync with the changes of inspector.html.

• blackberry/CMakeListsBlackBerry.txt:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• blackberry/CMakeListsBlackBerry.txt (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2011-11-26  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
+
+        [CMake] Clean up Web Inspector target in Source/WebKit/blackberry/CMakeListsBlackBerry.txt
+        https://bugs.webkit.org/show_bug.cgi?id=72784
+
+        Reviewed by Nikolas Zimmermann.
+
+        Abstracted the JavaScript file names from inspector/front-end/inspector.html
+        to keep them in-sync with the changes of inspector.html.
+
+        * blackberry/CMakeListsBlackBerry.txt:
+
 2011-11-23  Raphael Kubo da Costa  <kubo@profusion.mobi>
 

trunk/Source/WebKit/blackberry/CMakeListsBlackBerry.txt

@@ -169 +169 @@
 SET(WebKit_INSTALL_DIR "${CMAKE_SYSTEM_PROCESSOR}/usr/lib/torch-webkit")
 
-# FIXME: We need to make this target more straight forward to read and modify. See <https://bugs.webkit.org/show_bug.cgi?id=72784>.
-ADD_CUSTOM_TARGET(
+# Get the JavaScript file names from inspector.html, in order to keep the JavaScript files
+# generated in the correct order, and to keep the file names in-sync with the changes of inspector.html
+FILE (STRINGS ${WEBCORE_DIR}/inspector/front-end/inspector.html SCRIPT_TAGS REGEX "<script.* src=\".*js\".*></script>")
+FOREACH (_line IN LISTS SCRIPT_TAGS)
+    STRING (STRIP ${_line} _stripped_line)
+    STRING (REGEX REPLACE "<script.* src=\"(.*\\.js)\".*></script>" "\\1" _js_file ${_stripped_line})
+    STRING (COMPARE EQUAL ${_js_file} "InspectorBackendStub.js" _comp_result)
+    IF ( ${_comp_result} )
+        # InspectorBackendStub.js was generated with the build, should get it from DERIVED_SOURCES_WEBCORE_DIR.
+        SET (_js_file "${DERIVED_SOURCES_WEBCORE_DIR}/${_js_file}")
+    ELSE ()
+        SET (_js_file "${WEBCORE_DIR}/inspector/front-end/${_js_file}")
+    ENDIF ()
+    SET (JS_FILES ${JS_FILES} ${_js_file})
+ENDFOREACH ()
+SET (JS_FILES ${JS_FILES} ${WEBKIT_DIR}/blackberry/WebCoreSupport/inspectorBB.js)
+
+ADD_CUSTOM_TARGET (
     inspector ALL
-        # Note, we cannot "cat *.js" since the order of the JavaScript files is important for there to be no JavaScript errors.
-            COMMAND cat ${WEBCORE_DIR}/inspector/front-end/utilities.js ${WEBCORE_DIR}/inspector/front-end/BinarySearch.js ${WEBCORE_DIR}/inspector/front-end/treeoutline.js ${WEBCORE_DIR}/inspector/front-end/inspector.js ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendStub.js ${WEBCORE_DIR}/inspector/front-end/InspectorFrontendHostStub.js ${WEBCORE_DIR}/inspector/front-end/ExtensionRegistryStub.js ${WEBCORE_DIR}/inspector/front-end/Object.js ${WEBCORE_DIR}/inspector/front-end/Settings.js ${WEBCORE_DIR}/inspector/front-end/Checkbox.js ${WEBCORE_DIR}/inspector/front-end/ContextMenu.js ${WEBCORE_DIR}/inspector/front-end/SoftContextMenu.js ${WEBCORE_DIR}/inspector/front-end/KeyboardShortcut.js ${WEBCORE_DIR}/inspector/front-end/TextPrompt.js ${WEBCORE_DIR}/inspector/front-end/Popover.js ${WEBCORE_DIR}/inspector/front-end/TabbedPane.js ${WEBCORE_DIR}/inspector/front-end/Placard.js ${WEBCORE_DIR}/inspector/front-end/View.js ${WEBCORE_DIR}/inspector/front-end/IFrameView.js ${WEBCORE_DIR}/inspector/front-end/Drawer.js ${WEBCORE_DIR}/inspector/front-end/ConsoleView.js ${WEBCORE_DIR}/inspector/front-end/Panel.js ${WEBCORE_DIR}/inspector/front-end/TimelineGrid.js ${WEBCORE_DIR}/inspector/front-end/Resource.js ${WEBCORE_DIR}/inspector/front-end/CSSStyleModel.js ${WEBCORE_DIR}/inspector/front-end/NetworkManager.js ${WEBCORE_DIR}/inspector/front-end/ResourceTreeModel.js ${WEBCORE_DIR}/inspector/front-end/ResourceCategory.js ${WEBCORE_DIR}/inspector/front-end/TimelineManager.js ${WEBCORE_DIR}/inspector/front-end/Database.js ${WEBCORE_DIR}/inspector/front-end/DOMStorage.js ${WEBCORE_DIR}/inspector/front-end/DOMStorageItemsView.js ${WEBCORE_DIR}/inspector/front-end/DataGrid.js ${WEBCORE_DIR}/inspector/front-end/ShowMoreDataGridNode.js ${WEBCORE_DIR}/inspector/front-end/CookiesTable.js ${WEBCORE_DIR}/inspector/front-end/CookieItemsView.js ${WEBCORE_DIR}/inspector/front-end/ApplicationCacheItemsView.js ${WEBCORE_DIR}/inspector/front-end/Script.js ${WEBCORE_DIR}/inspector/front-end/SidebarPane.js ${WEBCORE_DIR}/inspector/front-end/ElementsTreeOutline.js ${WEBCORE_DIR}/inspector/front-end/SidebarTreeElement.js ${WEBCORE_DIR}/inspector/front-end/Section.js ${WEBCORE_DIR}/inspector/front-end/PropertiesSection.js ${WEBCORE_DIR}/inspector/front-end/RemoteObject.js ${WEBCORE_DIR}/inspector/front-end/ObjectPropertiesSection.js ${WEBCORE_DIR}/inspector/front-end/BreakpointsSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/DOMBreakpointsSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/CallStackSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/ScopeChainSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/WatchExpressionsSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/WorkersSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/MetricsSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/PropertiesSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/EventListenersSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/Color.js ${WEBCORE_DIR}/inspector/front-end/CSSCompletions.js ${WEBCORE_DIR}/inspector/front-end/CSSKeywordCompletions.js ${WEBCORE_DIR}/inspector/front-end/StylesSidebarPane.js ${WEBCORE_DIR}/inspector/front-end/PanelEnablerView.js ${WEBCORE_DIR}/inspector/front-end/WelcomeView.js ${WEBCORE_DIR}/inspector/front-end/StatusBarButton.js ${WEBCORE_DIR}/inspector/front-end/ElementsPanel.js ${WEBCORE_DIR}/inspector/front-end/NetworkPanel.js ${WEBCORE_DIR}/inspector/front-end/InjectedFakeWorker.js ${WEBCORE_DIR}/inspector/front-end/TextViewer.js ${WEBCORE_DIR}/inspector/front-end/SourceFrame.js ${WEBCORE_DIR}/inspector/front-end/ResourceView.js ${WEBCORE_DIR}/inspector/front-end/ScriptsPanel.js ${WEBCORE_DIR}/inspector/front-end/ResourcesPanel.js ${WEBCORE_DIR}/inspector/front-end/ProfilesPanel.js ${WEBCORE_DIR}/inspector/front-end/ConsolePanel.js ${WEBCORE_DIR}/inspector/front-end/ExtensionAPI.js ${WEBCORE_DIR}/inspector/front-end/ExtensionAuditCategory.js ${WEBCORE_DIR}/inspector/front-end/ExtensionCommon.js ${WEBCORE_DIR}/inspector/front-end/ExtensionServer.js ${WEBCORE_DIR}/inspector/front-end/ExtensionPanel.js ${WEBCORE_DIR}/inspector/front-end/AuditsPanel.js ${WEBCORE_DIR}/inspector/front-end/AuditResultView.js ${WEBCORE_DIR}/inspector/front-end/AuditLauncherView.js ${WEBCORE_DIR}/inspector/front-end/AuditRules.js ${WEBCORE_DIR}/inspector/front-end/AuditCategories.js ${WEBCORE_DIR}/inspector/front-end/AuditFormatters.js ${WEBCORE_DIR}/inspector/front-end/NetworkItemView.js ${WEBCORE_DIR}/inspector/front-end/EmptyView.js ${WEBCORE_DIR}/inspector/front-end/ResourceHeadersView.js ${WEBCORE_DIR}/inspector/front-end/ResourceCookiesView.js ${WEBCORE_DIR}/inspector/front-end/ResourceTimingView.js ${WEBCORE_DIR}/inspector/front-end/ResourceJSONView.js ${WEBCORE_DIR}/inspector/front-end/ResourceHTMLView.js ${WEBCORE_DIR}/inspector/front-end/ResourceResponseView.js ${WEBCORE_DIR}/inspector/front-end/ResourcePreviewView.js ${WEBCORE_DIR}/inspector/front-end/ScriptFormatter.js ${WEBCORE_DIR}/inspector/front-end/DOMSyntaxHighlighter.js ${WEBCORE_DIR}/inspector/front-end/TextEditorModel.js ${WEBCORE_DIR}/inspector/front-end/TextEditorHighlighter.js ${WEBCORE_DIR}/inspector/front-end/SourceTokenizer.js ${WEBCORE_DIR}/inspector/front-end/SourceCSSTokenizer.js ${WEBCORE_DIR}/inspector/front-end/SourceHTMLTokenizer.js ${WEBCORE_DIR}/inspector/front-end/SourceJavaScriptTokenizer.js ${WEBCORE_DIR}/inspector/front-end/FontView.js ${WEBCORE_DIR}/inspector/front-end/ImageView.js ${WEBCORE_DIR}/inspector/front-end/DatabaseTableView.js ${WEBCORE_DIR}/inspector/front-end/DatabaseQueryView.js ${WEBCORE_DIR}/inspector/front-end/ProfileDataGridTree.js ${WEBCORE_DIR}/inspector/front-end/BottomUpProfileDataGridTree.js ${WEBCORE_DIR}/inspector/front-end/TopDownProfileDataGridTree.js ${WEBCORE_DIR}/inspector/front-end/ProfileView.js ${WEBCORE_DIR}/inspector/front-end/PartialQuickSort.js ${WEBCORE_DIR}/inspector/front-end/HeapSnapshot.js ${WEBCORE_DIR}/inspector/front-end/HeapSnapshotProxy.js ${WEBCORE_DIR}/inspector/front-end/HeapSnapshotWorkerDispatcher.js ${WEBCORE_DIR}/inspector/front-end/DetailedHeapshotGridNodes.js ${WEBCORE_DIR}/inspector/front-end/DetailedHeapshotView.js ${WEBCORE_DIR}/inspector/front-end/DebuggerModel.js ${WEBCORE_DIR}/inspector/front-end/DebuggerPresentationModel.js ${WEBCORE_DIR}/inspector/front-end/SourceFile.js ${WEBCORE_DIR}/inspector/front-end/DOMAgent.js ${WEBCORE_DIR}/inspector/front-end/TimelineAgent.js ${WEBCORE_DIR}/inspector/front-end/TimelinePanel.js ${WEBCORE_DIR}/inspector/front-end/TimelineOverviewPane.js ${WEBCORE_DIR}/inspector/front-end/TestController.js ${WEBCORE_DIR}/inspector/front-end/HelpScreen.js ${WEBCORE_DIR}/inspector/front-end/GoToLineDialog.js ${WEBCORE_DIR}/inspector/front-end/SettingsScreen.js ${WEBCORE_DIR}/inspector/front-end/ShortcutsScreen.js ${WEBCORE_DIR}/inspector/front-end/HAREntry.js ${WEBCORE_DIR}/inspector/front-end/CookieParser.js ${WEBCORE_DIR}/inspector/front-end/Toolbar.js ${WEBCORE_DIR}/inspector/front-end/SearchController.js ${WEBCORE_DIR}/inspector/front-end/WorkerManager.js ${WEBCORE_DIR}/inspector/front-end/UserMetrics.js ${WEBCORE_DIR}/inspector/front-end/JavaScriptContextManager.js ${WEBCORE_DIR}/../WebKit/blackberry/WebCoreSupport/inspectorBB.js > ${DERIVED_SOURCES_WEBCORE_DIR}/javascript.js
+    COMMAND cat ${JS_FILES} > ${DERIVED_SOURCES_WEBCORE_DIR}/javascript.js
     DEPENDS ${WebCore_LIBRARY_NAME}
     COMMENT "Web Inspector resources building..."
-            )
+)