Title: [163773] releases/WebKitGTK/webkit-2.4/Tools
- Revision
- 163773
- Author
- carlo...@webkit.org
- Date
- 2014-02-10 00:32:33 -0800 (Mon, 10 Feb 2014)
Log Message
Merge r163375 - [Automake] Add missing $(feature_defines) when generating InjectedBundle bindings
https://bugs.webkit.org/show_bug.cgi?id=128170
Patch by Carlos Garnacho <carl...@gnome.org> on 2014-02-04
Reviewed by Carlos Garcia Campos.
* WebKitTestRunner/GNUmakefile.am: Add missing $(feature_defines) when
generating the InjectedBundle bindings. So the various ENABLE_* defines
are available there.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (163772 => 163773)
--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-02-10 08:28:42 UTC (rev 163772)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-02-10 08:32:33 UTC (rev 163773)
@@ -1,5 +1,16 @@
2014-02-04 Carlos Garnacho <carl...@gnome.org>
+ [Automake] Add missing $(feature_defines) when generating InjectedBundle bindings
+ https://bugs.webkit.org/show_bug.cgi?id=128170
+
+ Reviewed by Carlos Garcia Campos.
+
+ * WebKitTestRunner/GNUmakefile.am: Add missing $(feature_defines) when
+ generating the InjectedBundle bindings. So the various ENABLE_* defines
+ are available there.
+
+2014-02-04 Carlos Garnacho <carl...@gnome.org>
+
[GTK] Ensure generated events have given modifiers GDK understands
https://bugs.webkit.org/show_bug.cgi?id=128171
Modified: releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/GNUmakefile.am (163772 => 163773)
--- releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/GNUmakefile.am 2014-02-10 08:28:42 UTC (rev 163772)
+++ releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/GNUmakefile.am 2014-02-10 08:32:33 UTC (rev 163773)
@@ -161,7 +161,7 @@
-I $(srcdir)/Source/WebCore/bindings/scripts \
-I $(srcdir)/Tools/WebKitTestRunner/InjectedBundle/Bindings \
$(srcdir)/Source/WebCore/bindings/scripts/generate-bindings.pl \
- --defines \"\" --generator TestRunner \
+ --defines "$(feature_defines)" --generator TestRunner \
--include $(srcdir)/Tools/InjectedBundle/Bindings \
--outputDir $(top_builddir)/DerivedSources/InjectedBundle \
$<
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
