changeset
Add GIR to meson build.
Thu, 01 Sep 2016 01:20:19 -0400
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Thu, 01 Sep 2016 01:20:19 -0400
- branch
- meson
- changeset 38472
- 1f332f8141f4
- parent 38471
- a7ce1d49ac8c
- child 38473
- 919d72c1c8c0
Add GIR to meson build.
| finch/libgnt/meson.build | file | annotate | diff | comparison | revisions | |
| finch/meson.build | file | annotate | diff | comparison | revisions | |
| libpurple/meson.build | file | annotate | diff | comparison | revisions | |
| pidgin/meson.build | file | annotate | diff | comparison | revisions |
--- a/finch/libgnt/meson.build Mon Aug 29 04:26:44 2016 -0400 +++ b/finch/libgnt/meson.build Thu Sep 01 01:20:19 2016 -0400 @@ -92,39 +92,15 @@ LIBGNT_WIN32RES = WINDRES.process('libgnt_winres.rc') endif -#-include $(INTROSPECTION_MAKEFILE) -#INTROSPECTION_GIRS = -#INTROSPECTION_SCANNER_ARGS = \ -# --add-include-path=$(prefix)/share/gir-1.0 \ -# --warn-all -#INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0 - if enable_introspection -#introspection_sources = $(libgnt_lainclude_HEADERS) - -#Gnt-$(GNT_MAJOR_VERSION).$(GNT_MINOR_VERSION).gir: $(builddir)/libgnt.la -#Gnt_2_9_gir_INCLUDES = GObject-2.0 -#Gnt_2_9_gir_CFLAGS = \ -# $(INCLUDES) \ -# $(GLIB_CFLAGS) \ -# $(GNT_CFLAGS) \ -# $(LIBXML_CFLAGS) \ -# $(INTROSPECTION_CFLAGS) \ -# $(PY_CFLAGS) - -#Gnt_2_9_gir_LIBS = $(builddir)/libgnt.la -#Gnt_2_9_gir_FILES = $(introspection_sources) -#INTROSPECTION_GIRS += Gnt-$(GNT_MAJOR_VERSION).$(GNT_MINOR_VERSION).gir - -#girdir = \ -# $(prefix)/share/gir-1.0 \ -# $(INTROSPECTION_GIRDIR) -#gir_DATA = $(INTROSPECTION_GIRS) - -#typelibdir = \ -# $(prefix)/share/gir-1.0 \ -# $(INTROSPECTION_TYPELIBDIR) -#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + libgnt_gir = gnome.generate_gir(libgnt, + sources : libgnt_headers, + includes : 'GObject-2.0', + namespace : 'Gnt', + symbol_prefix : 'gnt_', + identifier_prefix : 'Gnt', + nsversion : '@0@.@1@'.format(gnt_major_version, gnt_minor_version), + install : true) endif subdir('wms')
--- a/finch/meson.build Mon Aug 29 04:26:44 2016 -0400 +++ b/finch/meson.build Thu Sep 01 01:20:19 2016 -0400 @@ -107,59 +107,18 @@ # $(GNT_CFLAGS) if ENABLE_GNT -# -include $(INTROSPECTION_MAKEFILE) -# INTROSPECTION_GIRS = -# INTROSPECTION_SCANNER_ARGS = \ -# --warn-all \ -# --add-include-path=$(prefix)/share/gir-1.0 \ -# --add-include-path=$(builddir)/libgnt \ -# --add-include-path=$(top_builddir)/libpurple - -# INTROSPECTION_COMPILER_ARGS = \ -# --includedir=$(prefix)/share/gir-1.0 \ -# --includedir=$(builddir)/libgnt \ -# --includedir=$(top_builddir)/libpurple - if enable_introspection -# introspection_sources = $(libfinchinclude_HEADERS) - -# Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libfinch.la -# Finch_3_0_gir_INCLUDES = \ -# Gnt-$(GNT_MAJOR_VERSION).$(GNT_MINOR_VERSION) \ -# Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION) + introspection_sources = libfinch_headers -# Finch_3_0_gir_CFLAGS = \ -# $(INCLUDES) \ -# -DSTANDALONE \ -# -DDATADIR=\"$(datadir)\" \ -# -DLIBDIR=\"$(libdir)/finch/\" \ -# -DLOCALEDIR=\"$(datadir)/locale\" \ -# -DSYSCONFDIR=\"$(sysconfdir)\" \ -# -I$(top_srcdir)/libpurple/ \ -# -I$(top_builddir)/libpurple/ \ -# -I$(top_srcdir) \ -# -I$(srcdir)/libgnt/ \ -# $(GLIB_CFLAGS) \ -# $(GPLUGIN_CFLAGS) \ -# $(DBUS_CFLAGS) \ -# $(LIBXML_CFLAGS) \ -# $(GSTREAMER_CFLAGS) \ -# $(INTROSPECTION_CFLAGS) \ -# $(GNT_CFLAGS) - -# Finch_3_0_gir_LIBS = $(builddir)/libfinch.la -# Finch_3_0_gir_FILES = $(introspection_sources) -# INTROSPECTION_GIRS += Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir - -# girdir = \ -# $(prefix)/share/gir-1.0 \ -# $(INTROSPECTION_GIRDIR) -# gir_DATA = $(INTROSPECTION_GIRS) - -# typelibdir = \ -# $(prefix)/share/gir-1.0 \ -# $(INTROSPECTION_TYPELIBDIR) -# typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + gnome.generate_gir(libfinch, + sources : introspection_sources, + includes : [libgnt_gir[0], libpurple_gir[0]], + namespace : 'Finch', + symbol_prefix : 'finch_', + identifier_prefix : 'Finch', + nsversion : '@0@.@1@'.format(purple_major_version, + purple_minor_version), + install : true) endif endif # ENABLE_GNT
--- a/libpurple/meson.build Mon Aug 29 04:26:44 2016 -0400 +++ b/libpurple/meson.build Thu Sep 01 01:20:19 2016 -0400 @@ -457,66 +457,28 @@ install : true, install_dir : get_option('libdir') + '/pkgconfig') -#-include $(INTROSPECTION_MAKEFILE) -#INTROSPECTION_GIRS = -#INTROSPECTION_SCANNER_ARGS = --add-include-path=$(prefix)/share/gir-1.0 --warn-all -#INTROSPECTION_COMPILER_ARGS = --includedir=$(prefix)/share/gir-1.0 - if enable_introspection - gnome = import('gnome') - introspection_sources = (purple_coreheaders + purple_builtheaders + dbus_headers + purple_cipherheaders + purple_mediaheaders) -# Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libpurple.la -# Purple_3_0_gir_INCLUDES = GObject-2.0 + Purple_gir_includes = ['GObject-2.0'] if PLUGINS -# Purple_3_0_gir_INCLUDES += GPlugin-0.0 + Purple_gir_includes += ['GPlugin-0.0'] endif if ENABLE_DBUS -# Purple_3_0_gir_INCLUDES += DBus-1.0 DBusGLib-1.0 + Purple_gir_includes += ['DBus-1.0', 'DBusGLib-1.0'] endif -# gnome.generate_gir(libpurple, -# namespace : 'Purple', -# nsversion : '3.0', # FIXME: Or major.minor? -# sources : introspection_sources, -# dependencies : [gplugin], -# install : true) - -#Purple_3_0_gir_CFLAGS = \ -# -I$(srcdir) \ -# $(INCLUDES) \ -# -DDATADIR=\"$(datadir)\" \ -# -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \ -# -DLOCALEDIR=\"$(datadir)/locale\" \ -# -DSYSCONFDIR=\"$(sysconfdir)\" \ -# $(GLIB_CFLAGS) \ -# $(GPLUGIN_CFLAGS) \ -# $(DBUS_CFLAGS) \ -# $(LIBXML_CFLAGS) \ -# $(FARSTREAM_CFLAGS) \ -# $(GSTREAMER_CFLAGS) \ -# $(GSTVIDEO_CFLAGS) \ -# $(GSTINTERFACES_CFLAGS) \ -# $(IDN_CFLAGS) \ -# $(NETWORKMANAGER_CFLAGS) \ -# $(JSON_CFLAGS) \ -# $(GNUTLS_CFLAGS) \ -# $(NSS_CFLAGS) \ -# $(ZLIB_CFLAGS) \ -# $(INTROSPECTION_CFLAGS) - -# Purple_3_0_gir_LIBS = $(builddir)/libpurple.la -# Purple_3_0_gir_FILES = $(introspection_sources) -# INTROSPECTION_GIRS += Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir - -# girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR) -# gir_DATA = $(INTROSPECTION_GIRS) - -# typelibdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_TYPELIBDIR) -# typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + libpurple_gir = gnome.generate_gir(libpurple, + sources : introspection_sources, + includes : Purple_gir_includes, + namespace : 'Purple', + symbol_prefix : 'purple_', + identifier_prefix : 'Purple', + nsversion : '@0@.@1@'.format(purple_major_version, + purple_minor_version), + install : true) endif subdir('tests')
--- a/pidgin/meson.build Mon Aug 29 04:26:44 2016 -0400 +++ b/pidgin/meson.build Thu Sep 01 01:20:19 2016 -0400 @@ -238,49 +238,18 @@ endif # INSTALL_I18N -# -include $(INTROSPECTION_MAKEFILE) -# INTROSPECTION_GIRS = -# INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(top_builddir)/libpurple --add-include-path=$(prefix)/share/gir-1.0 -# INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libpurple --includedir=$(prefix)/share/gir-1.0 - if enable_introspection -# introspection_sources = $(libpidgininclude_HEADERS) + introspection_sources = libpidgin_headers -# Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libpidgin.la -# Pidgin_3_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION) -# Pidgin_3_0_gir_CFLAGS = \ -# $(INCLUDES) \ -# -DDATADIR=\"$(datadir)\" \ -# -DLIBDIR=\"$(libdir)/pidgin/\" \ -# -DLOCALEDIR=\"$(datadir)/locale\" \ -# -DSYSCONFDIR=\"$(sysconfdir)\" \ -# -I$(top_builddir)/libpurple \ -# -I$(top_srcdir)/libpurple/ \ -# -I$(top_builddir) \ -# -I$(top_srcdir) \ -# $(GLIB_CFLAGS) \ -# $(GPLUGIN_CFLAGS) \ -# $(GCR_CFLAGS) \ -# $(GSTREAMER_CFLAGS) \ -# $(GSTVIDEO_CFLAGS) \ -# $(GSTINTERFACES_CFLAGS) \ -# $(GTK_CFLAGS) \ -# $(X11_CFLAGS) \ -# $(DBUS_CFLAGS) \ -# $(GTKSPELL_CFLAGS) \ -# $(LIBXML_CFLAGS) \ -# $(WEBKIT_CFLAGS) \ -# $(INTROSPECTION_CFLAGS) -# -# Pidgin_3_0_gir_LIBS = $(builddir)/libpidgin.la -# Pidgin_3_0_gir_FILES = $(introspection_sources) -# INTROSPECTION_GIRS += Pidgin-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir - -# girdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_GIRDIR) -# gir_DATA = $(INTROSPECTION_GIRS) - -# typelibdir = $(prefix)/share/gir-1.0 $(INTROSPECTION_TYPELIBDIR) -# typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + gnome.generate_gir(libpidgin, + sources : introspection_sources, + includes : ['GObject-2.0', 'Gtk-3.0', libpurple_gir[0]], + namespace : 'Pidgin', + symbol_prefix : 'pidgin_', + identifier_prefix : 'Pidgin', + nsversion : '@0@.@1@'.format(purple_major_version, + purple_minor_version), + install : true) endif subdir('pixmaps')
