Title: [130397] trunk/Source/WebKit
- Revision
- 130397
- Author
- [email protected]
- Date
- 2012-10-04 09:08:34 -0700 (Thu, 04 Oct 2012)
Log Message
[BlackBerry] Update how we compile inspector front-end _javascript_.
https://bugs.webkit.org/show_bug.cgi?id=98413
Reviewed by Rob Buis.
No longer cat all _javascript_ together, instead use the lazy init and
only append our custom changes script to the end of inspectorBB.html.
* PlatformBlackBerry.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (130396 => 130397)
--- trunk/Source/WebKit/ChangeLog 2012-10-04 15:57:50 UTC (rev 130396)
+++ trunk/Source/WebKit/ChangeLog 2012-10-04 16:08:34 UTC (rev 130397)
@@ -1,3 +1,15 @@
+2012-10-04 Konrad Piascik <[email protected]>
+
+ [BlackBerry] Update how we compile inspector front-end _javascript_.
+ https://bugs.webkit.org/show_bug.cgi?id=98413
+
+ Reviewed by Rob Buis.
+
+ No longer cat all _javascript_ together, instead use the lazy init and
+ only append our custom changes script to the end of inspectorBB.html.
+
+ * PlatformBlackBerry.cmake:
+
2012-10-03 Ryuan Choi <[email protected]>
[EFL] Default.edj should be generated although ENABLE_WEBKIT disabled.
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (130396 => 130397)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-10-04 15:57:50 UTC (rev 130396)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-10-04 16:08:34 UTC (rev 130397)
@@ -207,26 +207,9 @@
SET(WebKit_INSTALL_DIR "${CMAKE_SYSTEM_PROCESSOR}/usr/lib/torch-webkit")
-# 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=""
-FOREACH (_line IN LISTS SCRIPT_TAGS)
- STRING (STRIP ${_line} _stripped_line)
- STRING (REGEX REPLACE "<script.* src="" "\\1" _js_file ${_stripped_line})
- STRING (COMPARE EQUAL ${_js_file} "InspectorBackendCommands.js" _comp_result)
- IF ( ${_comp_result} )
- # InspectorBackendCommands.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
- COMMAND cat ${JS_FILES} > ${DERIVED_SOURCES_WEBCORE_DIR}/_javascript_.js
+ command cp ${WEBCORE_DIR}/inspector/front-end/inspector.html ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html && echo '<script src="" >> ${DERIVED_SOURCES_WEBCORE_DIR}/inspectorBB.html
DEPENDS ${WebCore_LIBRARY_NAME}
COMMENT "Web Inspector resources building..."
)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
