- Revision
- 148916
- Author
- [email protected]
- Date
- 2013-04-22 15:15:37 -0700 (Mon, 22 Apr 2013)
Log Message
[GTK] Enable introspection always for developer builds
https://bugs.webkit.org/show_bug.cgi?id=114983
Reviewed by Gustavo Noronha Silva.
.:
* Source/autotools/SetupAutoconfHeader.m4: No longer expose the ENABLE_INTROSPECTION
autoconf header variable. It isn't used and it means that when introspection is enabled
or disabled, there is an unnecessary full rebuild.
Source/WebKit/gtk:
* GNUmakefile.am: Make warnings during gir scanning cause the build to fail. Eliminate
warnings about deprecated API that the g-ir-scanner uses when generating
the scanner program. Use --quiet to avoid printing lots of output to
non-verbose builds.
Source/WebKit2:
* GNUmakefile.am: Make warnings during gir scanning cause the build to fail. Eliminate
warnings about deprecated API that the g-ir-scanner uses when generating
the scanner program. Use --quiet.
Tools:
* Scripts/webkitdirs.pm:
(runAutogenForAutotoolsProjectIfNecessary): Always enable introspection
when using build-webkit.
* gtk/jhbuildrc: Enable documentation for all jhbuild modules and explicitly
choose the memory gsettings backend while in the jhbuild. This eliminates
warnings from programs that fall back to the memory backend.
Modified Paths
Diff
Modified: trunk/ChangeLog (148915 => 148916)
--- trunk/ChangeLog 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/ChangeLog 2013-04-22 22:15:37 UTC (rev 148916)
@@ -1,3 +1,14 @@
+2013-04-22 Martin Robinson <[email protected]>
+
+ [GTK] Enable introspection always for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=114983
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/autotools/SetupAutoconfHeader.m4: No longer expose the ENABLE_INTROSPECTION
+ autoconf header variable. It isn't used and it means that when introspection is enabled
+ or disabled, there is an unnecessary full rebuild.
+
2013-04-22 Zan Dobersek <[email protected]>
[GTK] Set up libPlatform.la
Modified: trunk/Source/WebKit/gtk/ChangeLog (148915 => 148916)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-04-22 22:15:37 UTC (rev 148916)
@@ -1,5 +1,17 @@
2013-04-22 Martin Robinson <[email protected]>
+ [GTK] Enable introspection always for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=114983
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Make warnings during gir scanning cause the build to fail. Eliminate
+ warnings about deprecated API that the g-ir-scanner uses when generating
+ the scanner program. Use --quiet to avoid printing lots of output to
+ non-verbose builds.
+
+2013-04-22 Martin Robinson <[email protected]>
+
[GTK] Fix remaining introspection warnings
https://bugs.webkit.org/show_bug.cgi?id=114980
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (148915 => 148916)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-04-22 22:15:37 UTC (rev 148916)
@@ -295,7 +295,12 @@
if ENABLE_INTROSPECTION
WebKit-@[email protected]: $(G_IR_SCANNER) _javascript_Core-@[email protected] libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
- $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+ $(AM_V_GEN) \
+ CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+ $(G_IR_SCANNER) \
+ --quiet \
+ --warn-all \
+ --warn-error \
--symbol-prefix=webkit \
--identifier-prefix=WebKit \
--namespace=WebKit \
Modified: trunk/Source/WebKit2/ChangeLog (148915 => 148916)
--- trunk/Source/WebKit2/ChangeLog 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-22 22:15:37 UTC (rev 148916)
@@ -1,3 +1,14 @@
+2013-04-22 Martin Robinson <[email protected]>
+
+ [GTK] Enable introspection always for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=114983
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Make warnings during gir scanning cause the build to fail. Eliminate
+ warnings about deprecated API that the g-ir-scanner uses when generating
+ the scanner program. Use --quiet.
+
2013-04-22 Anders Carlsson <[email protected]>
Make it easier to extend NetworkResourceLoadParameters
Modified: trunk/Source/WebKit2/GNUmakefile.am (148915 => 148916)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-04-22 22:15:37 UTC (rev 148916)
@@ -262,7 +262,12 @@
if ENABLE_INTROSPECTION
WebKit2-@[email protected]: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
- $(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+ $(AM_V_GEN) \
+ CFLAGS="$(CFLAGS) -Wno-deprecated-declarations" \
+ $(G_IR_SCANNER) \
+ --quiet \
+ --warn-all \
+ --warn-error \
--symbol-prefix=webkit \
--identifier-prefix=WebKit \
--namespace=WebKit2 \
Modified: trunk/Source/autotools/SetupAutoconfHeader.m4 (148915 => 148916)
--- trunk/Source/autotools/SetupAutoconfHeader.m4 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Source/autotools/SetupAutoconfHeader.m4 2013-04-22 22:15:37 UTC (rev 148916)
@@ -58,10 +58,6 @@
AC_DEFINE([ENABLE_OPCODE_STATS], [1], [Define to enable Opcode statistics])
fi
-if test "$enable_introspection" = "yes"; then
- AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable GObject introspection support])
-fi
-
if test "$enable_video" = "yes" || test "$enable_web_audio" = "yes"; then
AC_DEFINE([WTF_USE_GSTREAMER], [1], [ ])
if test "$enable_debug" = "yes"; then
Modified: trunk/Tools/ChangeLog (148915 => 148916)
--- trunk/Tools/ChangeLog 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Tools/ChangeLog 2013-04-22 22:15:37 UTC (rev 148916)
@@ -1,3 +1,17 @@
+2013-04-22 Martin Robinson <[email protected]>
+
+ [GTK] Enable introspection always for developer builds
+ https://bugs.webkit.org/show_bug.cgi?id=114983
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Scripts/webkitdirs.pm:
+ (runAutogenForAutotoolsProjectIfNecessary): Always enable introspection
+ when using build-webkit.
+ * gtk/jhbuildrc: Enable documentation for all jhbuild modules and explicitly
+ choose the memory gsettings backend while in the jhbuild. This eliminates
+ warnings from programs that fall back to the memory backend.
+
2013-04-22 Zan Dobersek <[email protected]>
[GTK] Set up libPlatform.la
Modified: trunk/Tools/Scripts/webkitdirs.pm (148915 => 148916)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-04-22 22:15:37 UTC (rev 148916)
@@ -1994,6 +1994,9 @@
{
my ($dir, $prefix, $sourceDir, $project, $joinedOverridableFeatures, @buildArgs) = @_;
+ # Always enable introspection when building WebKitGTK+.
+ unshift(@buildArgs, "--enable-introspection");
+
my $joinedBuildArgs = join(" ", @buildArgs);
if (-e "GNUmakefile") {
Modified: trunk/Tools/gtk/jhbuildrc (148915 => 148916)
--- trunk/Tools/gtk/jhbuildrc 2013-04-22 22:07:05 UTC (rev 148915)
+++ trunk/Tools/gtk/jhbuildrc 2013-04-22 22:15:37 UTC (rev 148916)
@@ -54,3 +54,11 @@
# Avoid runtime conflicts with GStreamer system-wide plugins. We want
# to use only the plugins we build in JHBuild.
os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
+
+# We often end up using the memory backend anyway, so explicitly choosing
+# it will prevent the warning message.
+os.environ['GSETTINGS_BACKEND'] = 'memory'
+
+# We always enable introspection so that we can sniff out problems with our
+# annotations sooner rather than later.
+autogenargs='--enable-introspection'
