Title: [164562] trunk
- Revision
- 164562
- Author
- [email protected]
- Date
- 2014-02-23 14:44:23 -0800 (Sun, 23 Feb 2014)
Log Message
[GTK] Fix build after Web Inspector code reorganization (r164543)
https://bugs.webkit.org/show_bug.cgi?id=129231
Patch by Diego Pino García <[email protected]> on 2014-02-23
Reviewed by Dean Jackson.
Source/WebInspectorUI:
* GNUmakefile.am:
Modify paths to Web Inspector code.
Source/WebKit2:
* PlatformGTK.cmake:
Modify paths to Web Inspector code.
Tools:
* gtk/generate-inspector-gresource-manifest.py:
Modify paths to Web Inspector code.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (164561 => 164562)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-23 22:44:23 UTC (rev 164562)
@@ -1,3 +1,13 @@
+2014-02-23 Diego Pino García <[email protected]>
+
+ [GTK] Fix build after Web Inspector code reorganization (r164543)
+ https://bugs.webkit.org/show_bug.cgi?id=129231
+
+ Reviewed by Dean Jackson.
+
+ * GNUmakefile.am:
+ Modify paths to Web Inspector code.
+
2014-02-23 Antoine Quint <[email protected]>
Web Inspector: color picker sliders aren't laid out correctly
Modified: trunk/Source/WebInspectorUI/GNUmakefile.am (164561 => 164562)
--- trunk/Source/WebInspectorUI/GNUmakefile.am 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Source/WebInspectorUI/GNUmakefile.am 2014-02-23 22:44:23 UTC (rev 164562)
@@ -1,11 +1,16 @@
${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
- $(WebInspectorUI)/UserInterface/*.html \
- $(WebInspectorUI)/UserInterface/*.js \
- $(WebInspectorUI)/UserInterface/*.css \
- $(WebInspectorUI)/UserInterface/Images/*.png \
- $(WebInspectorUI)/UserInterface/Images/*.svg \
- $(WebInspectorUI)/UserInterface/External/CodeMirror/* \
- $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
+ $(WebInspectorUI)/UserInterface/*.html \
+ $(WebInspectorUI)/UserInterface/Base/*.js \
+ $(WebInspectorUI)/UserInterface/Controllers/*.css \
+ $(WebInspectorUI)/UserInterface/Controllers/*.js \
+ $(WebInspectorUI)/UserInterface/Models/*.js \
+ $(WebInspectorUI)/UserInterface/Protocol/*.js \
+ $(WebInspectorUI)/UserInterface/Views/*.css \
+ $(WebInspectorUI)/UserInterface/Views/*.js \
+ $(WebInspectorUI)/UserInterface/Images/*.png \
+ $(WebInspectorUI)/UserInterface/Images/*.svg \
+ $(WebInspectorUI)/UserInterface/External/CodeMirror/* \
+ $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
$(AM_V_GEN)
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
@@ -25,11 +30,15 @@
DerivedSources/WebInspectorUI/GResourceBundle.c
EXTRA_DIST += \
- $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
- $(shell ls $(WebInspectorUI)/UserInterface/*.html) \
- $(shell ls $(WebInspectorUI)/UserInterface/*.js) \
- $(shell ls $(WebInspectorUI)/UserInterface/*.css) \
- $(shell ls $(WebInspectorUI)/UserInterface/Images/*.png) \
- $(shell ls $(WebInspectorUI)/UserInterface/Images/*.svg) \
- $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*)
-
+ $(WebInspectorUI)/Localizations/en.lproj/localizedStrings.js \
+ $(shell ls $(WebInspectorUI)/UserInterface/*.html) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Base/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Controllers/*.css) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Controllers/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Models/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Protocol/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Views/*.css) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Views/*.js) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Images/*.png) \
+ $(shell ls $(WebInspectorUI)/UserInterface/Images/*.svg) \
+ $(shell ls $(WebInspectorUI)/UserInterface/External/CodeMirror/*)
Modified: trunk/Source/WebKit2/ChangeLog (164561 => 164562)
--- trunk/Source/WebKit2/ChangeLog 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-23 22:44:23 UTC (rev 164562)
@@ -1,3 +1,13 @@
+2014-02-23 Diego Pino García <[email protected]>
+
+ [GTK] Fix build after Web Inspector code reorganization (r164543)
+ https://bugs.webkit.org/show_bug.cgi?id=129231
+
+ Reviewed by Dean Jackson.
+
+ * PlatformGTK.cmake:
+ Modify paths to Web Inspector code.
+
2014-02-22 Joseph Pecoraro <[email protected]>
Remove some unreachable code (-Wunreachable-code)
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (164561 => 164562)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-02-23 22:44:23 UTC (rev 164562)
@@ -368,13 +368,18 @@
)
file(GLOB InspectorFiles
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.css
+ ${CMAKE_SOURCE_DIR}/Source/Localizations/en.lproj/localizedStrings.js
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Base/*.js
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.css
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Controllers/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/External/CodeMirror/*
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.html
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Models/*.js
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Protocol/*.js
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.css
+ ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Views/*.js
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.png
${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/*.svg
- ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/*.js
)
# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
Modified: trunk/Tools/ChangeLog (164561 => 164562)
--- trunk/Tools/ChangeLog 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Tools/ChangeLog 2014-02-23 22:44:23 UTC (rev 164562)
@@ -1,3 +1,13 @@
+2014-02-23 Diego Pino García <[email protected]>
+
+ [GTK] Fix build after Web Inspector code reorganization (r164543)
+ https://bugs.webkit.org/show_bug.cgi?id=129231
+
+ Reviewed by Dean Jackson.
+
+ * gtk/generate-inspector-gresource-manifest.py:
+ Modify paths to Web Inspector code.
+
2014-02-23 Martin Robinson <[email protected]>
[GTK] generate-gtkdoc should use argparse
Modified: trunk/Tools/gtk/generate-inspector-gresource-manifest.py (164561 => 164562)
--- trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-02-23 21:43:20 UTC (rev 164561)
+++ trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-02-23 22:44:23 UTC (rev 164562)
@@ -23,8 +23,13 @@
resources_path = common.top_level_path() + "/Source/WebInspectorUI/"
inspector_files = \
glob.glob(resources_path + 'UserInterface/*.html') + \
- glob.glob(resources_path + 'UserInterface/*.js') + \
- glob.glob(resources_path + 'UserInterface/*.css') + \
+ glob.glob(resources_path + 'UserInterface/Base/*.js') + \
+ glob.glob(resources_path + 'UserInterface/Controllers/*.css') + \
+ glob.glob(resources_path + 'UserInterface/Controllers/*.js') + \
+ glob.glob(resources_path + 'UserInterface/Models/*.js') + \
+ glob.glob(resources_path + 'UserInterface/Protocol/*.js') + \
+ glob.glob(resources_path + 'UserInterface/Views/*.css') + \
+ glob.glob(resources_path + 'UserInterface/Views/*.js') + \
glob.glob(resources_path + 'UserInterface/Images/*.png') + \
glob.glob(resources_path + 'UserInterface/Images/*.svg') + \
glob.glob(resources_path + 'UserInterface/External/CodeMirror/*') + \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
