[evolution-data-server/wip/mcrha/libical-glib] Drop gir and vala bindings generator for libedata-cal



commit 02c500ee36fae4f7a94f5f690f8fa02f94c09aeb
Author: Milan Crha <mcrha redhat com>
Date:   Fri Mar 1 16:03:38 2019 +0100

    Drop gir and vala bindings generator for libedata-cal
    
    To have it fully working it requires libebackend (otherwise there
    are unresolved types, though there are also some from libedataserver),
    but gir fails to work due to libebackend contains a dynamic type
    (ECacheReaper) and aborts build on it. Maybe once this is fixed,
    and all the other quirks, it can be returned back.
    
    There will be the client side bindings only for now.

 src/calendar/libedata-cal/CMakeLists.txt | 41 --------------------------------
 src/vala/CMakeLists.txt                  | 34 --------------------------
 src/vala/EDataCal-2.0.metadata           |  0
 src/vala/libedata-cal-2.0.deps           |  3 ---
 4 files changed, 78 deletions(-)
---
diff --git a/src/calendar/libedata-cal/CMakeLists.txt b/src/calendar/libedata-cal/CMakeLists.txt
index 18f1a32a5..d968fdffe 100644
--- a/src/calendar/libedata-cal/CMakeLists.txt
+++ b/src/calendar/libedata-cal/CMakeLists.txt
@@ -89,47 +89,6 @@ install(FILES ${HEADERS}
        DESTINATION ${privincludedir}/libedata-cal
 )
 
-set(gir_sources ${SOURCES} ${HEADERS})
-set(gir_identifies_prefixes EDataCal E)
-set(gir_includes GObject-2.0 Gio-2.0 Soup-2.4 libxml2-2.0 ICalGLib-3.0)
-set(gir_cflags
-       -DLIBEDATA_CAL_COMPILATION
-       -I${CMAKE_BINARY_DIR}/src/calendar
-       -I${CMAKE_SOURCE_DIR}/src/calendar
-)
-set(gir_libdirs
-       ${CMAKE_BINARY_DIR}/src/camel
-       ${CMAKE_BINARY_DIR}/src/libebackend
-       ${CMAKE_BINARY_DIR}/src/libedataserver
-       ${CMAKE_BINARY_DIR}/src/calendar/libecal
-       ${CMAKE_BINARY_DIR}/src/calendar/libedata-cal
-)
-set(gir_libs
-       ebackend
-       ecal
-       edata-cal
-       edataserver
-)
-set(gir_deps
-       ${CMAKE_BINARY_DIR}/src/camel/Camel-${API_VERSION}.gir
-       ${CMAKE_BINARY_DIR}/src/libedataserver/EDataServer-${API_VERSION}.gir
-       ${CMAKE_BINARY_DIR}/src/calendar/libecal/ECal-${CAL_API_VERSION}.gir
-)
-
-gir_add_introspection_simple(
-       EDataCal
-       libedata-cal
-       ${CAL_API_VERSION}
-       "libedata-cal/libedata-cal.h"
-       gir_identifies_prefixes
-       gir_includes
-       gir_cflags
-       gir_libdirs
-       gir_libs
-       gir_deps
-       gir_sources
-)
-
 set(DEPENDENCIES
        ebackend
        edataserver
diff --git a/src/vala/CMakeLists.txt b/src/vala/CMakeLists.txt
index c2066a615..a468556a1 100644
--- a/src/vala/CMakeLists.txt
+++ b/src/vala/CMakeLists.txt
@@ -9,8 +9,6 @@ set(valafiles
        ${CMAKE_CURRENT_BINARY_DIR}/libebook-contacts-${API_VERSION}.vapi
        ${CMAKE_CURRENT_SOURCE_DIR}/libecal-${CAL_API_VERSION}.deps
        ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}.vapi
-       ${CMAKE_CURRENT_SOURCE_DIR}/libedata-cal-${CAL_API_VERSION}.deps
-       ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${CAL_API_VERSION}.vapi
 )
 
 if(HAVE_GTK)
@@ -201,38 +199,6 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}
                ${gir_deps}
 )
 
-# ***********************************
-# libedata-cal
-# ***********************************
-
-set(gir_fullname ${CMAKE_BINARY_DIR}/src/calendar/libedata-cal/EDataCal-${CAL_API_VERSION}.gir)
-gir_girfilename_to_target(gir_deps EDataCal-${CAL_API_VERSION}.gir)
-
-add_dependencies(vala ${gir_deps})
-
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libedata-cal-${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 libecal-${CAL_API_VERSION}
-               --pkg gio-2.0
-               --pkg libxml-2.0
-               --pkg libsoup-2.4
-               --pkg posix
-               --library libedata-cal-${CAL_API_VERSION}
-               --metadatadir=${CMAKE_CURRENT_SOURCE_DIR}
-               ${gir_fullname}
-       DEPENDS libedata-cal-${CAL_API_VERSION}.deps
-               ${CMAKE_CURRENT_BINARY_DIR}/libedataserver-${API_VERSION}.vapi
-               ${CMAKE_CURRENT_BINARY_DIR}/libecal-${CAL_API_VERSION}.vapi
-               ${gir_fullname}
-               ${gir_deps}
-)
-
 # ***********************************
 # Install all VAPI files
 # ***********************************


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]