[babl] Remove broken introspection bindings
- From: Daniel Sabo <daniels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] Remove broken introspection bindings
- Date: Tue, 15 Oct 2013 14:56:54 +0000 (UTC)
commit 74f2ddfbfacedcc95bd60d366896c753c576e1fc
Author: Daniel Sabo <DanielSabo gmail com>
Date: Thu Oct 10 05:30:58 2013 -0700
Remove broken introspection bindings
They primarily existed to support GEGL, and there are more
solid wrappers around the related functions in GEGL now.
Makefile.am | 2 -
babl/Babl-0.1.gir.static | 457 ----------------------------------------------
babl/Makefile.am | 56 ------
configure.ac | 28 ---
m4/introspection.m4 | 94 ----------
tests/Makefile.am | 11 +-
tests/introspection.py | 18 --
7 files changed, 1 insertions(+), 665 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7008414..d2a4f2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-#DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
SUBDIRS = \
babl \
@@ -23,7 +22,6 @@ EXTRA_DIST = \
NEWS \
TODO \
autogen.sh \
- m4/introspection.m4 \
babl.pc.in
DISTCLEANFILES = \
diff --git a/babl/Makefile.am b/babl/Makefile.am
index 976b1e0..5d0c1f1 100644
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -87,61 +87,5 @@ libbabl_ BABL_API_VERSION@_la_LDFLAGS= \
${no_undefined} $(MATH_LIB) \
-version-info $(BABL_LIBRARY_VERSION)
-# GObject Introspection
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
-INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
-if HAVE_INTROSPECTION
-
-if HAVE_GI_RENAME_TO
-Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am
libbabl- BABL_API_VERSION@.la
- $(INTROSPECTION_SCANNER) -v --warn-all \
- --namespace Babl --nsversion=$(BABL_API_VERSION) \
- --add-include-path=$(srcdir) --add-include-path=. \
- --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \
- --libtool="$(LIBTOOL)" \
- --output $@ \
- -DBABL_IS_BEING_COMPILED \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(addprefix $(srcdir)/, $(libinc_hdrs)) \
- $(addprefix $(builddir)/, $(libinc_generated_hdrs)) \
- $(addprefix $(srcdir)/, $(c_sources))
-
-else # HAVE_GI_RENAME_TO
-# If the "rename to" gobject introspection annotation is not respected (GI <= 1.33.4)
-# we have to use a pre-generated .gir file. See https://bugzilla.gnome.org/show_bug.cgi?id=673422
-# and https://bugzilla.gnome.org/show_bug.cgi?id=675985
-Babl-$(BABL_API_VERSION).gir:
- cp $ static $@
-
-endif # HAVE_GI_RENAME_TO
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Babl-$(BABL_API_VERSION).gir
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = Babl-$(BABL_API_VERSION).typelib
-
-%.typelib: %.gir
- LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) \
- --includedir=$(srcdir) \
- --includedir=$(top_builddir)/babl \
- $(G_IR_COMPILER_OPTS) \
- $< -o $@
-
-if HAVE_VALA
-babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir
- $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir
-
-vapidir=$(datadir)/vala/vapi
-vapi_DATA = babl-$(BABL_API_VERSION).vapi
-
-endif # HAVE_VALA
-
-endif # HAVE_INTROSPECTION
-
EXTRA_DIST = $(gir_DATA)
CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA)
diff --git a/configure.ac b/configure.ac
index 8d3826a..4fe66b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,34 +61,6 @@ AC_SUBST(BABL_API_VERSION)
BABL_RELEASE=babl_api_version
AC_SUBST(BABL_RELEASE)
-# GObject Introspection
-GOBJECT_INTROSPECTION_CHECK([0.10])
-
-# Check whether g-ir-scanner respects "rename to" annotation
-PKG_CHECK_MODULES([GI_1_33_5], [gobject-introspection-1.0 >= 1.33.5],
- [have_gi_rename_to=true],
- [have_gi_rename_to=false]
-)
-AM_CONDITIONAL(HAVE_GI_RENAME_TO, [test x$have_gi_rename_to = xtrue])
-
-# Vala
-AC_ARG_WITH(vala, [ --without-vala build without Vala support])
-
-have_vapigen="no"
-if test "x$with_vala" != "xno"; then
-
- AC_PATH_PROG(VAPIGEN, vapigen, no)
- if test "$VAPIGEN" = "no"; then
- have_vapigen="no (vapigen executable not found)"
- AC_MSG_RESULT([*** Check for vapigen failed.])
- else
- have_vapigen="yes"
- fi
-fi
-
-have_vala=$have_vapigen
-AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes")
-
dnl The symbol BABL_UNSTABLE is defined above for substitution in
dnl Makefiles and conditionally defined here as a preprocessor symbol
dnl and automake conditional.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5f7e5b2..709bd84 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,14 +23,8 @@ C_TESTS = \
cairo-RGB24 \
$(CONCURRENCY_STRESS_TEST)
-if HAVE_INTROSPECTION
-INTROSPECTION_TESTS = \
- introspection.py
-endif
-
TESTS = \
- $(C_TESTS) \
- $(INTROSPECTION_TESTS)
+ $(C_TESTS)
TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(top_builddir)/babl:$LD_LIBRARY_PATH
GI_TYPELIB_PATH=$(top_builddir)/babl BABL_PATH=$(top_builddir)/extensions/.libs
@@ -44,9 +38,6 @@ LDADD = $(top_builddir)/babl/libbabl- BABL_API_VERSION@.la \
EXTRA_DIST=common.inc
-dist_noinst_SCRIPTS = \
- introspection.py
-
noinst_PROGRAMS = \
introspect \
babl_fish_path_fitness \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]