From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 8 Dec 2012 20:51:19 +0000 (-0500)
Subject: Remove introspection of libecal.
X-Git-Tag: upstream/3.7.4~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47b5c9525f76c487a76eb629653aa59ec1f64c40;p=platform%2Fupstream%2Fevolution-data-server.git

Remove introspection of libecal.

A great deal of the calendar API exposes data structures from libical.
libical is not a GObject library, and is therefore not introspectable.
This is unfortunate, but the API has been this way for over a decade.

The g-ir-scanner skips functions with data types it does not understand.
Therefore a great deal of the calendar API is omitted from introspection
and the resulting language bindings are not actually useful. This causes
confusion and disappointment, judging by the number of times I've had to
explain this to programmers in the #evolution channel.

Annotating the calendar API for introspection is still good practice.
But until this situation changes, let's not give the false impression
that E-D-S calendars are accessible from non-C languages by producing
a less-than-useful GIR file.

Remove the introspection.
---

diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 434cf56..69f4d22 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -88,51 +88,6 @@ BUILT_SOURCES = $(ENUM_GENERATED) $(MARSHAL_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = \
-	--warn-all \
-	--add-include-path=$(top_builddir)/libedataserver \
-	--identifier-prefix E \
-	--pkg-export libecal-1.2 \
-	--c-include="libecal/libecal.h" \
-	-D EDS_DISABLE_DEPRECATED \
-	$(NULL)
-INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(top_builddir)/libedataserver \
-	$(NULL)
-
-if HAVE_INTROSPECTION
-
-introspection_sources = \
-	$(filter-out %-private.h, $(libecalinclude_HEADERS) $(libecal_1_2_la_SOURCES))
-
-ECalendar-1.2.gir: libecal-1.2.la
-ECalendar_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0
-ECalendar_1_2_gir_CFLAGS = \
-	$(libecal_INCLUDES) \
-	-DLIBECAL_COMPILATION \
-	$(EVOLUTION_CALENDAR_CFLAGS) \
-	$(CAMEL_CFLAGS) \
-	$(NULL)
-ECalendar_1_2_gir_LIBS = \
-	libecal-1.2.la \
-	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la \
-	$(top_builddir)/libedataserver/libedataserver-1.2.la \
-	$(top_builddir)/camel/libcamel-1.2.la \
-	$(NULL)
-ECalendar_1_2_gir_FILES = $(introspection_sources)
-INTROSPECTION_GIRS += ECalendar-1.2.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibdir = $(libdir)/girepository-1.0
-typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
-endif
-
 EXTRA_DIST = 						\
 	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)	\
 	e-cal-enumtypes.h.template			\
diff --git a/vala/ECalendar-1.2.metadata b/vala/ECalendar-1.2.metadata
deleted file mode 100644
index e69de29..0000000
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 7ebbcff..dd08d45 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -2,17 +2,14 @@ vapidir = $(datarootdir)/vala/vapi
 vapi_DATA = \
 	libedataserver-1.2.vapi \
 	libebook-1.2.vapi \
-	libecalendar-1.2.vapi \
 	$(NULL)
 dist_vapi_DATA = \
 	libebook-1.2.deps \
-	libecalendar-1.2.deps \
 	$(NULL)
 
 EXTRA_DIST = \
 	EBook-1.2.metadata \
 	libebook-1.2-custom.vala \
-	ECalendar-1.2.metadata \
 	EDataServer-1.2.metadata \
 	$(NULL)
 
@@ -37,18 +34,6 @@ libedataserver-1.2.vapi: $(top_builddir)/libedataserver/EDataServer-1.2.gir
 		< libedataserver-1.2.vapi.tmp > $@
 	@rm  libedataserver-1.2.vapi.tmp
 
-libecalendar-1.2.vapi: $(top_builddir)/calendar/libecal/ECalendar-1.2.gir libedataserver-1.2.vapi
-	$(VAPIGEN_V)$(VAPIGEN) \
-		--vapidir=. \
-		--girdir=$(top_builddir)/libedataserver \
-		--pkg libedataserver-1.2 \
-		--pkg gio-2.0 \
-		--pkg libxml-2.0 \
-		--library libecalendar-1.2 \
-		--metadatadir=$(srcdir) \
-		$< \
-		$(NULL)
-
 libebook-1.2.vapi: $(top_builddir)/addressbook/libebook/EBook-1.2.gir libedataserver-1.2.vapi libebook-1.2-custom.vala
 	$(VAPIGEN_V)$(VAPIGEN) \
 		--vapidir=. \
diff --git a/vala/libecalendar-1.2.deps b/vala/libecalendar-1.2.deps
deleted file mode 100644
index 4478fb0..0000000
--- a/vala/libecalendar-1.2.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-libxml-2.0
-gio-2.0