Package: emacs;
Reported by: Philipp Moeller <bootsarehax <at> gmail.com>
Date: Mon, 20 Jan 2014 16:48:03 UTC
Severity: wishlist
Found in version 24.3
Fixed in version 26.1
Done: Glenn Morris <rgm <at> gnu.org>
Bug is archived. No further changes may be made.
Message #26 received at 16507 <at> debbugs.gnu.org (full text, mbox):
From: Rüdiger Sonderfeld <ruediger <at> c-plusplus.net> To: emacs-devel <at> gnu.org Cc: 16507 <at> debbugs.gnu.org Subject: [RFC] Add a systemd service file for dealing with emacs --daemon. Date: Wed, 03 Dec 2014 20:39:44 +0100
As discussed in Bug#16507, I've added a systemd service file to deal with
emacs --daemon. This however requires some installation changes. That's why
I submit this patch for review before pushing it.
A new configuration flag `--with-systemduserunitdir' is added to set the
installation directory for the user unit. If it is unset an attempt is made
to locate the default directory by using pkg-config.
(I guess this should also get an entry in etc/NEWS.)
* configure.ac (with_systemduserunitdir): New option.
* Makefile.in (systemdunitdir,SYSTEMD_UNITS): New variables.
(install-etc): Install systemd unit file.
(uninstall): Uninstall systemd unit file.
* etc/emacs.service.in: New file.
---
ChangeLog | 8 ++++++++
Makefile.in | 17 +++++++++++++++++
configure.ac | 19 +++++++++++++++++++
etc/ChangeLog | 5 +++++
etc/emacs.service.in | 14 ++++++++++++++
5 files changed, 63 insertions(+)
create mode 100644 etc/emacs.service.in
diff --git a/ChangeLog b/ChangeLog
index cd7698c..05ad878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-03 Rüdiger Sonderfeld <ruediger <at> c-plusplus.de>
+
+ Add a systemd service file for dealing with emacs --daemon.
+ * configure.ac (with_systemduserunitdir): New option.
+ * Makefile.in (systemdunitdir,SYSTEMD_UNITS): New variables.
+ (install-etc): Install systemd unit file.
+ (uninstall): Uninstall systemd unit file.
+
2014-12-01 Lars Magne Ingebrigtsen <larsi <at> gnus.org>
* .gitignore: Ignore loaddefs directly under lisp, and in
diff --git a/Makefile.in b/Makefile.in
index ccb70a4..b1e6be5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -241,6 +241,9 @@ etcdocdir=@etcdocdir@
# Where to install Emacs game score files.
gamedir=@gamedir@
+# Where to install systemd unit files.
+systemdunitdir=@systemdunitdir@
+
# ==================== Utility Programs for the Build ====================
# Allow the user to specify the install program.
@@ -286,6 +289,9 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed
's|$(srcdir)/||g'`
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
+# systemd unit
+SYSTEMD_UNITS = @SYSTEMD_UNITS@
+
all: ${SUBDIR} info
.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver
@@ -716,6 +722,16 @@ install-etc:
|| exit 1; \
done ; \
done
+ if test "x$(SYSTEMD_UNITS)" = "xemacs.service" ; then \
+ tmp=etc/emacs.service; rm -f $${tmp}; \
+ sed \
+ -e "s;@emacs_prog@;${bindir}/${EMACSFULL};" \
+ -e "s;@emacsclient_prog@;${bindir}/emacsclient${EXEEXT};" \
+ "$(srcdir)/etc/emacs.service.in" > $${tmp}; \
+ umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"; \
+ $(INSTALL_DATA) $${tmp} "$(DESTDIR)$(systemdunitdir)/emacs.service"; \
+ rm -f $${tmp}; \
+ fi
### Build Emacs and install it, stripping binaries while installing them.
install-strip:
@@ -771,6 +787,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
file="$(DESTDIR)${gamedir}/$${file}"; \
[ -s "$${file}" ] || rm -f "$$file"; \
done
+ -rm -f "$(DESTDIR)$(systemdunitdir)/emacs.service"
### Windows-specific uninstall target for removing programs produced
### in nt/, and its Posix do-nothing shadow.
diff --git a/configure.ac b/configure.ac
index 010abc8..e737f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,10 @@ otherwise for the first of `gfile' or `inotify' that is
usable.])
],
[with_file_notification=$with_features])
+AC_ARG_WITH([systemduserunitdir],
+ AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user
service files]),
+ [], [with_systemduserunitdir=default])
+
## For the times when you want to build Emacs but don't have
## a suitable makeinfo, and can live without the manuals.
dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html
@@ -2678,6 +2682,21 @@ AC_SUBST(NOTIFY_OBJ)
AC_SUBST(GFILENOTIFY_CFLAGS)
AC_SUBST(GFILENOTIFY_LIBS)
+if test "x$with_systemduserunitdir" != xno; then
+ if test "x$with_systemduserunitdir" = xdefault; then
+ with_systemduserunitdir=`"$PKG_CONFIG" --variable=systemduserunitdir
systemd`
+ fi
+ AC_SUBST([systemdunitdir], [$with_systemduserunitdir])
+fi
+
+if test -n "$with_systemduserunitdir" -a "x$with_systemduserunitdir" != xno ;
then
+ SYSTEMD_UNITS="emacs.service"
+else
+ SYSTEMD_UNITS=""
+fi
+
+AC_SUBST(SYSTEMD_UNITS)
+
dnl Do not put whitespace before the #include statements below.
dnl Older compilers (eg sunos4 cc) choke on it.
HAVE_XAW3D=no
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 4f672df..02c0895 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Rüdiger Sonderfeld <ruediger <at> c-plusplus.de>
+
+ Add a systemd service file for dealing with emacs --daemon.
+ * emacs.service.in: New file.
+
2014-12-02 Eli Zaretskii <eliz <at> gnu.org>
* NEWS: Mention 'bidi-find-overridden-directionality'.
diff --git a/etc/emacs.service.in b/etc/emacs.service.in
new file mode 100644
index 0000000..0e59bc2
--- /dev/null
+++ b/etc/emacs.service.in
@@ -0,0 +1,14 @@
+# -*- conf-mode -*-
+# Copyright (C) 2014 Free Software Foundation, Inc.
+[Unit]
+Description=Emacs: the extensible, customizable text editor - and more.
+Documentation=info:Emacs man:emacs(1) https://gnu.org/software/emacs/
+
+[Service]
+Type=forking
+ExecStart=@emacs_prog@ --daemon
+ExecStop=@emacsclient_prog@ --eval "(kill-emacs)"
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
--
2.1.3
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.