[gexiv2/wip/0.12: 12/12] Remove VAPI override and meta-data



commit d7b74efde359024bbf3d44a92b8994d72c0b77e0
Author: Corentin Noël <corentin elementary io>
Date:   Thu Jan 11 15:08:53 2018 +0100

    Remove VAPI override and meta-data
    
    Use native GObject introspection for Vala, also provide Vala .deps files
    automatically in meson

 gexiv2/meson.build        |    8 ++++++++
 meson.build               |    4 ----
 vapi/GExiv2-0.10.metadata |    3 ---
 vapi/gexiv2-custom.vala   |    4 ----
 vapi/meson.build          |    4 ----
 5 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/gexiv2/meson.build b/gexiv2/meson.build
index d4f6a85..628bcab 100644
--- a/gexiv2/meson.build
+++ b/gexiv2/meson.build
@@ -91,6 +91,7 @@ if introspection_available
                  version_header,
                  enum_sources.get(1)
                  ],
+      header : 'gexiv2/gexiv2.h',
       namespace : 'GExiv2',
       nsversion : '0.10',
       symbol_prefix : 'gexiv2',
@@ -99,4 +100,11 @@ if introspection_available
       includes : ['GObject-2.0'],
       header : 'gexiv2/gexiv2.h',
       install : true)
+
+    if vapi_available
+        vapi = gnome.generate_vapi('gexiv2',
+                               sources : gir.get(0),
+                               install : true,
+                               packages: pc_deps)
+    endif
 endif
diff --git a/meson.build b/meson.build
index 1f6bfab..4313526 100644
--- a/meson.build
+++ b/meson.build
@@ -18,10 +18,6 @@ if get_option('docs')
   subdir('docs')
 endif
 
-if vapi_available
-  subdir('vapi')
-endif
-
 python2_available = false
 python3_available = false
 python_gi_test_args = ['-c', 'import gi; print(gi._overridesdir)']


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