From 27d8bbf871efeefe628819d78547dc2ec64abf94 Mon Sep 17 00:00:00 2001 From: kotontrion Date: Fri, 27 Sep 2024 23:39:11 +0200 Subject: core: move vapi dir to src --- core/meson.build | 3 --- core/src/meson.build | 3 +++ core/src/vapi/AstalInhibitManager.vapi | 13 +++++++++++++ core/vapi/AstalInhibitManager.vapi | 13 ------------- 4 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 core/src/vapi/AstalInhibitManager.vapi delete mode 100644 core/vapi/AstalInhibitManager.vapi (limited to 'core') diff --git a/core/meson.build b/core/meson.build index f25b5a0..a2606db 100644 --- a/core/meson.build +++ b/core/meson.build @@ -15,9 +15,6 @@ prefix = get_option('prefix') libdir = get_option('prefix') / get_option('libdir') pkgdatadir = prefix / get_option('datadir') / 'astal' -vapi_dir = meson.current_source_dir() / 'vapi' -add_project_arguments(['--vapidir', vapi_dir], language: 'vala') - assert( get_option('lib') or get_option('cli'), 'Either lib or cli option must be set to true.', diff --git a/core/src/meson.build b/core/src/meson.build index 11839f1..b5adda2 100644 --- a/core/src/meson.build +++ b/core/src/meson.build @@ -3,6 +3,9 @@ api_version = version_split[0] + '.' + version_split[1] gir = 'Astal-' + api_version + '.gir' typelib = 'Astal-' + api_version + '.typelib' +vapi_dir = meson.current_source_dir() / 'vapi' +add_project_arguments(['--vapidir', vapi_dir], language: 'vala') + config = configure_file( input: 'config.vala.in', output: 'config.vala', diff --git a/core/src/vapi/AstalInhibitManager.vapi b/core/src/vapi/AstalInhibitManager.vapi new file mode 100644 index 0000000..6232a3c --- /dev/null +++ b/core/src/vapi/AstalInhibitManager.vapi @@ -0,0 +1,13 @@ +[CCode (cprefix = "Astal", gir_namespace = "Astal", lower_case_cprefix = "astal_")] +namespace Astal { + [CCode (cheader_filename = "idle-inhibit.h", type_id = "astal_idle_inhibit_manager_get_type()")] + public class InhibitManager : GLib.Object { + public static unowned InhibitManager? get_default(); + public Inhibitor inhibit (Gtk.Window window); + } + + [CCode (cheader_filename = "idle-inhibit.h", free_function = "zwp_idle_inhibitor_v1_destroy")] + [Compact] + public class Inhibitor { + } +} diff --git a/core/vapi/AstalInhibitManager.vapi b/core/vapi/AstalInhibitManager.vapi deleted file mode 100644 index 6232a3c..0000000 --- a/core/vapi/AstalInhibitManager.vapi +++ /dev/null @@ -1,13 +0,0 @@ -[CCode (cprefix = "Astal", gir_namespace = "Astal", lower_case_cprefix = "astal_")] -namespace Astal { - [CCode (cheader_filename = "idle-inhibit.h", type_id = "astal_idle_inhibit_manager_get_type()")] - public class InhibitManager : GLib.Object { - public static unowned InhibitManager? get_default(); - public Inhibitor inhibit (Gtk.Window window); - } - - [CCode (cheader_filename = "idle-inhibit.h", free_function = "zwp_idle_inhibitor_v1_destroy")] - [Compact] - public class Inhibitor { - } -} -- cgit v1.2.3