Title: [171961] trunk/Source
- Revision
- 171961
- Author
- clo...@igalia.com
- Date
- 2014-08-01 17:10:11 -0700 (Fri, 01 Aug 2014)
Log Message
REGRESSION(r171942): [CMAKE] [GTK] build broken (clean build).
https://bugs.webkit.org/show_bug.cgi?id=135522
Reviewed by Martin Robinson.
Source/_javascript_Core:
* CMakeLists.txt: Output the inspector headers inside inspector
subdirectory.
Source/WebCore:
No new tests required, no new functionality.
* CMakeLists.txt: Add missing include to the inspector headers
and fix the path to InspectorJSTypeBuilders.h
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (171960 => 171961)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-02 00:00:19 UTC (rev 171960)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2014-08-02 00:10:11 UTC (rev 171961)
@@ -883,7 +883,7 @@
MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
DEPENDS ${_javascript_Core_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
${_javascript_Core_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type _javascript_ --write_always
+ COMMAND ${PYTHON_EXECUTABLE} ${_javascript_Core_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type _javascript_ --write_always
VERBATIM)
file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
Modified: trunk/Source/_javascript_Core/ChangeLog (171960 => 171961)
--- trunk/Source/_javascript_Core/ChangeLog 2014-08-02 00:00:19 UTC (rev 171960)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-08-02 00:10:11 UTC (rev 171961)
@@ -1,3 +1,13 @@
+2014-08-01 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ REGRESSION(r171942): [CMAKE] [GTK] build broken (clean build).
+ https://bugs.webkit.org/show_bug.cgi?id=135522
+
+ Reviewed by Martin Robinson.
+
+ * CMakeLists.txt: Output the inspector headers inside inspector
+ subdirectory.
+
2014-08-01 Mark Lam <mark....@apple.com>
Add some structure related assertions.
Modified: trunk/Source/WebCore/CMakeLists.txt (171960 => 171961)
--- trunk/Source/WebCore/CMakeLists.txt 2014-08-02 00:00:19 UTC (rev 171960)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-08-02 00:10:11 UTC (rev 171961)
@@ -120,6 +120,7 @@
"${WTF_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
"${CMAKE_BINARY_DIR}"
@@ -3275,7 +3276,7 @@
DEPENDS ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py
${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSTypeBuilders.h
COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol" --output_type Web --write_always
VERBATIM)
Modified: trunk/Source/WebCore/ChangeLog (171960 => 171961)
--- trunk/Source/WebCore/ChangeLog 2014-08-02 00:00:19 UTC (rev 171960)
+++ trunk/Source/WebCore/ChangeLog 2014-08-02 00:10:11 UTC (rev 171961)
@@ -1,3 +1,15 @@
+2014-08-01 Carlos Alberto Lopez Perez <clo...@igalia.com>
+
+ REGRESSION(r171942): [CMAKE] [GTK] build broken (clean build).
+ https://bugs.webkit.org/show_bug.cgi?id=135522
+
+ Reviewed by Martin Robinson.
+
+ No new tests required, no new functionality.
+
+ * CMakeLists.txt: Add missing include to the inspector headers
+ and fix the path to InspectorJSTypeBuilders.h
+
2014-08-01 Simon Fraser <simon.fra...@apple.com>
Fix resource leak in FillLayersPropertyWrapper object member
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
