[evolution-data-server/wip/mcrha/libical-glib] [build-broken] Add introspection and vala definitions for libecal
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/wip/mcrha/libical-glib] [build-broken] Add introspection and vala definitions for libecal
- Date: Wed, 16 Jan 2019 10:35:18 +0000 (UTC)
commit 9342d4937991cbdede955e839f28942f28f4bdd8
Author: Milan Crha <mcrha redhat com>
Date: Wed Jan 16 11:33:15 2019 +0100
[build-broken] Add introspection and vala definitions for libecal
It breaks build and it'll stay broken for a long time, because
it's not possible to port all the parts separately or in smaller
chunks.
src/calendar/libecal/CMakeLists.txt | 26 ++++++++++++++++++++++++++
src/calendar/libecal/e-reminder-watcher.c | 2 +-
src/vala/CMakeLists.txt | 30 ++++++++++++++++++++++++++++++
src/vala/ECal-2.0.metadata | 0
src/vala/libecal-2.0.deps | 2 ++
5 files changed, 59 insertions(+), 1 deletion(-)
---
diff --git a/src/calendar/libecal/CMakeLists.txt b/src/calendar/libecal/CMakeLists.txt
index 7dfed98e8..8386809ad 100644
--- a/src/calendar/libecal/CMakeLists.txt
+++ b/src/calendar/libecal/CMakeLists.txt
@@ -86,3 +86,29 @@ install(TARGETS ecal
install(FILES ${HEADERS}
DESTINATION ${privincludedir}/libecal
)
+
+set(gir_sources ${SOURCES} ${HEADERS})
+set(gir_identifies_prefixes ECal)
+set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0)
+set(gir_cflags
+ -DLIBECAL_COMPILATION
+ -I${CMAKE_BINARY_DIR}/src/calendar
+ -I${CMAKE_SOURCE_DIR}/src/calendar
+)
+set(gir_libdirs)
+set(gir_libs ecal)
+set(gir_deps)
+
+gir_add_introspection_simple(
+ ECal
+ libecal
+ ${CAL_API_VERSION}
+ "libecal/libecal.h"
+ gir_identifies_prefixes
+ gir_includes
+ gir_cflags
+ gir_libdirs
+ gir_libs
+ gir_deps
+ gir_sources
+)
diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
index d3ba4517b..1055f71f6 100644
--- a/src/calendar/libecal/e-reminder-watcher.c
+++ b/src/calendar/libecal/e-reminder-watcher.c
@@ -2116,7 +2116,7 @@ e_reminder_watcher_class_init (EReminderWatcherClass *klass)
* @watcher: an #EReminderWatcher
* @rd: an #EReminderData
* @itt: a pointer to struct icaltimetype
- * @inout_buffer: (caller allocates) (inout): a pointer to a buffer to fill with formatted @itt
+ * @inout_buffer: (inout): a pointer to a buffer to fill with formatted @itt
* @buffer_size: size of inout_buffer
*
* Formats time @itt to a string and writes it to @inout_buffer, which can hold
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index 1815ad78b..0eaf6e07f 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -166,6 +166,36 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libebook-${API_VERSION}.va
${gir_deps}
)
+# ***********************************
+# libecal
+# ***********************************
+
+set(gir_fullname ${CMAKE_BINARY_DIR}/src/calendar/libecal/ECal-${CAL_API_VERSION}.gir)
+gir_girfilename_to_target(gir_deps ECal-${CAL_API_VERSION}.gir)
+
+add_dependencies(vala ${gir_deps})
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}.vapi
+ COMMAND ${VAPIGEN}
+ --vapidir=${CMAKE_CURRENT_SOURCE_DIR}
+ --vapidir=${CMAKE_CURRENT_BINARY_DIR}
+ --girdir=${CMAKE_BINARY_DIR}/src/camel
+ --girdir=${CMAKE_BINARY_DIR}/src/libedataserver
+ --girdir=${CMAKE_BINARY_DIR}/src/calendar/libecal
+ --pkg libedataserver-${API_VERSION}
+ --pkg gio-2.0
+ --pkg libxml-2.0
+ --pkg libsoup-2.4
+ --pkg posix
+ --library libecal-${CAL_API_VERSION}
+ --metadatadir=${CMAKE_CURRENT_SOURCE_DIR}
+ ${gir_fullname}
+ DEPENDS libecal-${CAL_API_VERSION}.deps
+ ${CMAKE_CURRENT_BINARY_DIR}/libedataserver-${API_VERSION}.vapi
+ ${gir_fullname}
+ ${gir_deps}
+)
+
# ***********************************
# Install all VAPI files
# ***********************************
diff --git a/src/vala/ECal-2.0.metadata b/src/vala/ECal-2.0.metadata
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/vala/libecal-2.0.deps b/src/vala/libecal-2.0.deps
new file mode 100644
index 000000000..4478fb09c
--- /dev/null
+++ b/src/vala/libecal-2.0.deps
@@ -0,0 +1,2 @@
+libxml-2.0
+gio-2.0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]