From a69254612c46a909e9f0788521d38d8e6b6b44c8 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Jul 2018 17:47:49 +0100 Subject: [PATCH] Install as a DBus service --- hammond-gtk/resources/meson.build | 9 ++++++++- hammond-gtk/resources/org.gnome.Hammond.desktop | 1 + hammond-gtk/resources/org.gnome.Hammond.service.in | 3 +++ meson.build | 5 ++++- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 hammond-gtk/resources/org.gnome.Hammond.service.in diff --git a/hammond-gtk/resources/meson.build b/hammond-gtk/resources/meson.build index 3904700..99253a6 100644 --- a/hammond-gtk/resources/meson.build +++ b/hammond-gtk/resources/meson.build @@ -3,4 +3,11 @@ install_data('org.gnome.Hammond.desktop', install_dir : datadir + '/applications') install_data('org.gnome.Hammond.appdata.xml', install_dir : datadir + '/appdata') install_data('org.gnome.Hammond.gschema.xml', install_dir: join_paths(datadir, 'glib-2.0', 'schemas')) -meson.add_install_script('../../scripts/compile-gschema.py') \ No newline at end of file + + +configure_file(input: 'org.gnome.Hammond.service.in', + output: 'org.gnome.Hammond.service', + configuration: hammond_conf, + install_dir: join_paths([datadir,'dbus-1/services'])) + +meson.add_install_script('../../scripts/compile-gschema.py') diff --git a/hammond-gtk/resources/org.gnome.Hammond.desktop b/hammond-gtk/resources/org.gnome.Hammond.desktop index 829c093..17b3641 100644 --- a/hammond-gtk/resources/org.gnome.Hammond.desktop +++ b/hammond-gtk/resources/org.gnome.Hammond.desktop @@ -9,3 +9,4 @@ Type=Application StartupNotify=true Categories=AudioVideo;Audio;Video; Keywords=Podcast +DBusActivatable=true diff --git a/hammond-gtk/resources/org.gnome.Hammond.service.in b/hammond-gtk/resources/org.gnome.Hammond.service.in new file mode 100644 index 0000000..7b23700 --- /dev/null +++ b/hammond-gtk/resources/org.gnome.Hammond.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.gnome.Hammond +Exec=@BINDIR@/hammond --gapplication-service \ No newline at end of file diff --git a/meson.build b/meson.build index e9bb1fa..6428c59 100644 --- a/meson.build +++ b/meson.build @@ -16,6 +16,9 @@ hammond_version_micro = version_array[2].to_int() hammond_prefix = get_option('prefix') hammond_bindir = join_paths(hammond_prefix, get_option('bindir')) +hammond_conf = configuration_data() +hammond_conf.set('BINDIR', hammond_bindir) + datadir = get_option('datadir') icondir = join_paths(datadir, 'icons') subdir('hammond-gtk/resources') @@ -35,4 +38,4 @@ cargo_release = custom_target('cargo-build', run_target('release', command: ['scripts/release.sh', meson.project_name() + '-' + hammond_version - ]) \ No newline at end of file + ])