Changeset 148916 in webkit

Timestamp:

Apr 22, 2013 3:15:37 PM (11 years ago)

Author:

Martin Robinson

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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/GNUmakefile.am (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (1 diff)
• Source/autotools/SetupAutoconfHeader.m4 (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)
• Tools/gtk/jhbuildrc (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2013-04-22  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <zdobersek@igalia.com>
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-04-22  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <mrobinson@igalia.com>
 

trunk/Source/WebKit/gtk/GNUmakefile.am

@@ -296 +296 @@
 if ENABLE_INTROSPECTION
 WebKit-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) JavaScriptCore-@WEBKITGTK_API_VERSION@.gir libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-        $(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 \

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-22  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <andersca@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -263 +263 @@
 
 WebKit2-@WEBKITGTK_API_VERSION@.gir: $(G_IR_SCANNER) libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-        $(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 \

trunk/Source/autotools/SetupAutoconfHeader.m4

@@ -59 +59 @@
 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], [ ])

trunk/Tools/ChangeLog

@@ +1 @@
+2013-04-22  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <zdobersek@igalia.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1995 +1995 @@
     my ($dir, $prefix, $sourceDir, $project, $joinedOverridableFeatures, @buildArgs) = @_;
 
+    # Always enable introspection when building WebKitGTK+.
+    unshift(@buildArgs, "--enable-introspection");
+
     my $joinedBuildArgs = join(" ", @buildArgs);
 

trunk/Tools/gtk/jhbuildrc

@@ -55 +55 @@
 # 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'