[shotwell/wip/phako/enhanced-faces: 129/136] facedetect: Install service file
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/phako/enhanced-faces: 129/136] facedetect: Install service file
- Date: Thu, 11 Oct 2018 09:57:26 +0000 (UTC)
commit 35fa46ed1953399746ef73eae03269b94b611d46
Author: Jens Georg <mail jensge org>
Date: Thu Oct 11 09:32:08 2018 +0200
facedetect: Install service file
Generate the Exec= entry from meson
facedetect/meson.build | 17 ++++++++++++++++-
facedetect/org.gnome.Shotwell.Faces1.service.in | 3 +++
facedetect/org.gnome.shotwell.faces.service | 3 ---
3 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/facedetect/meson.build b/facedetect/meson.build
index a19ffc0c..150817df 100644
--- a/facedetect/meson.build
+++ b/facedetect/meson.build
@@ -9,15 +9,30 @@ if has_dnn
else
dnn_define = []
endif
+
+libexecdir = join_paths(get_option('libexecdir'), 'shotwell')
+
gio_unix = dependency('gio-unix-2.0', required : true)
gdbus_src = gnome.gdbus_codegen('dbus-interface',
sources: 'org.gnome.ShotwellFaces1.xml',
interface_prefix : 'org.gnome.')
+
executable('shotwell-facedetect',
'shotwell-facedetect.cpp', 'facedetect-opencv.cpp', gdbus_src,
dependencies : [facedetect_dep, gio, gio_unix, dnn_define],
install : true,
include_directories: config_incdir,
- install_dir : join_paths(get_option('libexecdir'), 'shotwell'))
+ install_dir : libexecdir)
install_data('facedetect-haarcascade.xml',
install_dir : join_paths(get_option('datadir'), 'shotwell'))
+
+con = configuration_data()
+con.set('libexecdir', join_paths(get_option('prefix'), libexecdir))
+
+configure_file(
+ input : 'org.gnome.Shotwell.Faces1.service.in',
+ output : 'org.gnome.Shotwell.Faces1.service',
+ configuration: con,
+ install: true,
+ install_dir : join_paths(get_option('datadir'), 'dbus-1', 'services')
+ )
diff --git a/facedetect/org.gnome.Shotwell.Faces1.service.in b/facedetect/org.gnome.Shotwell.Faces1.service.in
new file mode 100644
index 00000000..127d7445
--- /dev/null
+++ b/facedetect/org.gnome.Shotwell.Faces1.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.Shotwell.Faces1
+Exec=@libexecdir@/shotwell-facedetect
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]