[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[shepherd] 03/05: Rename modules to (shepherd ...).
|
From: |
Ludovic Courtès |
|
Subject: |
[shepherd] 03/05: Rename modules to (shepherd ...). |
|
Date: |
Mon, 11 Jan 2016 23:14:18 +0000 |
civodul pushed a commit to branch master
in repository shepherd.
commit 8bedbbae914b91a9497e6fc86ef2425df985f157
Author: Ludovic Courtès <address@hidden>
Date: Mon Jan 11 22:31:40 2016 +0100
Rename modules to (shepherd ...).
* modules/dmd: Rename directory to...
* modules/shepherd: ... this. Adjust module names accordingly.
* modules/deco.scm, modules/dmd.scm, modules/halt.scm,
modules/reboot.scm, tests/status-sexp.sh: Use the new module names.
* configure.ac: Adjust to the new file names.
* Makefile.am (templates, BUILT_SOURCES): Adjust file names.
(modules/dmd/config.scm): Rename target to...
(modules/shepherd/config.scm): ... this.
(dmddir, dmdsubdir): Rename to...
(shepherddir, shepherdsubdir): ... these. Adjust corresponding variable
names accordingly.
(install-exec-hook): Adjust accordingly.
(dmd_install_go_files): Rename to...
(shepherd_install_go_files): ... this.
---
Makefile.am | 68 +++++++++++++++---------------
configure.ac | 2 +-
modules/deco.scm | 8 ++--
modules/dmd.scm | 14 +++---
modules/halt.scm | 6 +-
modules/reboot.scm | 6 +-
modules/{dmd => shepherd}/args.scm | 6 +-
modules/{dmd => shepherd}/comm.scm | 4 +-
modules/{dmd => shepherd}/config.scm.in | 2 +-
modules/{dmd => shepherd}/runlevel.scm | 6 +-
modules/{dmd => shepherd}/service.scm | 10 ++--
modules/{dmd => shepherd}/support.scm | 6 +-
modules/{dmd => shepherd}/system.scm.in | 2 +-
tests/status-sexp.sh | 4 +-
14 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 798f167..0d6dcbc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,37 +21,37 @@ bin_SCRIPTS = dmd deco
sbin_SCRIPTS = halt reboot
templates = \
dmd.in deco.in halt.in reboot.in \
- modules/dmd/config.scm.in \
- modules/dmd/system.scm.in
+ modules/shepherd/config.scm.in \
+ modules/shepherd/system.scm.in
# Build this module first.
-BUILT_SOURCES = modules/dmd/config.scm
+BUILT_SOURCES = modules/shepherd/config.scm
# The source files.
-dmddir = ${datadir}/dmd
-dist_dmd_DATA = \
+shepherddir = ${datadir}/shepherd
+dist_shepherd_DATA = \
modules/deco.scm \
modules/dmd.scm \
modules/halt.scm \
modules/reboot.scm
-nodist_dmd_DATA = $(dist_dmd_DATA:%.scm=%.go)
-
-dmdsubdir = $(dmddir)/dmd
-dist_dmdsub_DATA = \
- modules/dmd/args.scm \
- modules/dmd/service.scm \
- modules/dmd/support.scm \
- modules/dmd/runlevel.scm \
- modules/dmd/comm.scm
-nodist_dmdsub_DATA = \
- modules/dmd/config.scm \
- modules/dmd/config.go \
- modules/dmd/system.scm \
- modules/dmd/system.go \
- $(dist_dmdsub_DATA:%.scm=%.go)
-
-CLEANFILES = \
- $(nodist_dmd_DATA) $(nodist_dmdsub_DATA) \
+nodist_shepherd_DATA = $(dist_shepherd_DATA:%.scm=%.go)
+
+shepherdsubdir = $(shepherddir)/shepherd
+dist_shepherdsub_DATA = \
+ modules/shepherd/args.scm \
+ modules/shepherd/service.scm \
+ modules/shepherd/support.scm \
+ modules/shepherd/runlevel.scm \
+ modules/shepherd/comm.scm
+nodist_shepherdsub_DATA = \
+ modules/shepherd/config.scm \
+ modules/shepherd/config.go \
+ modules/shepherd/system.scm \
+ modules/shepherd/system.go \
+ $(dist_shepherdsub_DATA:%.scm=%.go)
+
+CLEANFILES = \
+ $(nodist_shepherd_DATA) $(nodist_shepherdsub_DATA) \
$(bin_SCRIPTS) $(sbin_SCRIPTS)
# Documentation.
@@ -71,13 +71,13 @@ install-data-local:
# Relocate the script---i.e., have them refer to the installed module
# directory.
install-exec-hook: install-executable-symlinks
- for script in \
- $(bin_SCRIPTS:%=$(DESTDIR)$(bindir)/%) \
- $(sbin_SCRIPTS:%=$(DESTDIR)$(sbindir)/%) ; \
- do \
- $(SED) -e's|$(abs_top_srcdir)/modules|$(dmddir)|g' \
- -e's|$(abs_top_builddir)/modules|$(dmddir)|g' \
- -i $$script ; \
+ for script in \
+ $(bin_SCRIPTS:%=$(DESTDIR)$(bindir)/%) \
+ $(sbin_SCRIPTS:%=$(DESTDIR)$(sbindir)/%) ; \
+ do \
+ $(SED) -e's|$(abs_top_srcdir)/modules|$(shepherddir)|g' \
+ -e's|$(abs_top_builddir)/modules|$(shepherddir)|g' \
+ -i $$script ; \
done
# Install 'shutdown' as a symlink to 'halt; XXX: someday we'll do
@@ -114,11 +114,11 @@ maybe_executable =
\
$(SED) $(instantiate) < $< >$@
$(maybe_executable)
-modules/dmd/config.scm: modules/dmd/config.scm.in Makefile
+modules/shepherd/config.scm: modules/shepherd/config.scm.in Makefile
$(MKDIR_P) "`dirname address@hidden"
$(SED) $(instantiate) < $< >$@
-# Make sure 'modules/dmd/{config,system.scm}' are built first.
+# Make sure 'modules/shepherd/{config,system.scm}' are built first.
# XXX: Use the C locale for when Guile lacks
#
<http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
%.go: %.scm $(templates:%.in=%)
@@ -156,8 +156,8 @@ AM_SH_LOG_FLAGS = -x -e
# files. See
# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
# for details.
-dmd_install_go_files = install-nobase_nodist_guilemoduleDATA
-$(dmd_install_go_files): install-nobase_dist_guilemoduleDATA
+shepherd_install_go_files = install-nobase_nodist_guilemoduleDATA
+$(shepherd_install_go_files): install-nobase_dist_guilemoduleDATA
gen-ChangeLog:
if test -d .git; then \
diff --git a/configure.ac b/configure.ac
index 7076b39..878dc3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,6 @@ dnl Finish.
AC_CONFIG_FILES([Makefile
examples/Makefile
utils/Makefile
- modules/dmd/system.scm])
+ modules/shepherd/system.scm])
AC_OUTPUT
diff --git a/modules/deco.scm b/modules/deco.scm
index df55a7f..f2298e1 100644
--- a/modules/deco.scm
+++ b/modules/deco.scm
@@ -18,10 +18,10 @@
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
(define-module (deco)
- #:use-module (dmd config)
- #:use-module (dmd support)
- #:use-module (dmd args)
- #:use-module (dmd comm)
+ #:use-module (shepherd config)
+ #:use-module (shepherd support)
+ #:use-module (shepherd args)
+ #:use-module (shepherd comm)
#:use-module (oop goops)
#:use-module (ice-9 rdelim)
#:use-module (ice-9 match)
diff --git a/modules/dmd.scm b/modules/dmd.scm
index b414b9e..c194b8a 100644
--- a/modules/dmd.scm
+++ b/modules/dmd.scm
@@ -24,13 +24,13 @@
#:use-module (oop goops) ;; Defining classes and methods.
#:use-module (srfi srfi-1) ;; List library.
#:use-module (srfi srfi-26)
- #:use-module (dmd config)
- #:use-module (dmd support)
- #:use-module (dmd service)
- #:use-module (dmd system)
- #:use-module (dmd runlevel)
- #:use-module (dmd args)
- #:use-module (dmd comm)
+ #:use-module (shepherd config)
+ #:use-module (shepherd support)
+ #:use-module (shepherd service)
+ #:use-module (shepherd system)
+ #:use-module (shepherd runlevel)
+ #:use-module (shepherd args)
+ #:use-module (shepherd comm)
#:export (program-name
main))
diff --git a/modules/halt.scm b/modules/halt.scm
index f37c5e2..96da176 100644
--- a/modules/halt.scm
+++ b/modules/halt.scm
@@ -17,9 +17,9 @@
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
(define-module (halt)
- #:use-module (dmd support)
- #:use-module (dmd args)
- #:use-module (dmd comm)
+ #:use-module (shepherd support)
+ #:use-module (shepherd args)
+ #:use-module (shepherd comm)
#:use-module (oop goops)
#:use-module (ice-9 rdelim)
#:export (program-name
diff --git a/modules/reboot.scm b/modules/reboot.scm
index 75279a3..d92f2de 100644
--- a/modules/reboot.scm
+++ b/modules/reboot.scm
@@ -17,9 +17,9 @@
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
(define-module (reboot)
- #:use-module (dmd support)
- #:use-module (dmd args)
- #:use-module (dmd comm)
+ #:use-module (shepherd support)
+ #:use-module (shepherd args)
+ #:use-module (shepherd comm)
#:use-module (oop goops)
#:use-module (ice-9 rdelim)
#:export (program-name
diff --git a/modules/dmd/args.scm b/modules/shepherd/args.scm
similarity index 98%
rename from modules/dmd/args.scm
rename to modules/shepherd/args.scm
index fb6f738..fdcc83f 100644
--- a/modules/dmd/args.scm
+++ b/modules/shepherd/args.scm
@@ -17,10 +17,10 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd args)
+(define-module (shepherd args)
#:use-module (oop goops)
- #:use-module (dmd support)
- #:use-module (dmd config)
+ #:use-module (shepherd support)
+ #:use-module (shepherd config)
#:export (<option>
process-args))
diff --git a/modules/dmd/comm.scm b/modules/shepherd/comm.scm
similarity index 98%
rename from modules/dmd/comm.scm
rename to modules/shepherd/comm.scm
index 0466ff6..af854f0 100644
--- a/modules/dmd/comm.scm
+++ b/modules/shepherd/comm.scm
@@ -17,8 +17,8 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd comm)
- #:use-module (dmd support)
+(define-module (shepherd comm)
+ #:use-module (shepherd support)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
#:use-module (oop goops)
diff --git a/modules/dmd/config.scm.in b/modules/shepherd/config.scm.in
similarity index 94%
rename from modules/dmd/config.scm.in
rename to modules/shepherd/config.scm.in
index 0ee9340..345078c 100644
--- a/modules/dmd/config.scm.in
+++ b/modules/shepherd/config.scm.in
@@ -1,6 +1,6 @@
;; config.scm.in -- Making information accessible in -*- scheme -*- code.
-(define-module (dmd config)
+(define-module (shepherd config)
#:export (Version
Prefix-dir
%localstatedir
diff --git a/modules/dmd/runlevel.scm b/modules/shepherd/runlevel.scm
similarity index 98%
rename from modules/dmd/runlevel.scm
rename to modules/shepherd/runlevel.scm
index 7a4d6be..48e36ba 100644
--- a/modules/dmd/runlevel.scm
+++ b/modules/shepherd/runlevel.scm
@@ -17,11 +17,11 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd runlevel)
+(define-module (shepherd runlevel)
#:use-module (oop goops)
#:use-module (srfi srfi-1)
- #:use-module (dmd support)
- #:use-module (dmd service)
+ #:use-module (shepherd support)
+ #:use-module (shepherd service)
#:export (<runlevel>
enter
enter-selector
diff --git a/modules/dmd/service.scm b/modules/shepherd/service.scm
similarity index 99%
rename from modules/dmd/service.scm
rename to modules/shepherd/service.scm
index c9e6c89..a318393 100644
--- a/modules/dmd/service.scm
+++ b/modules/shepherd/service.scm
@@ -18,16 +18,16 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd service)
+(define-module (shepherd service)
#:use-module (oop goops)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
- #:use-module (dmd support)
- #:use-module (dmd comm)
- #:use-module (dmd config)
- #:use-module (dmd system)
+ #:use-module (shepherd support)
+ #:use-module (shepherd comm)
+ #:use-module (shepherd config)
+ #:use-module (shepherd system)
#:replace (system
system*)
#:export (<service>
diff --git a/modules/dmd/support.scm b/modules/shepherd/support.scm
similarity index 98%
rename from modules/dmd/support.scm
rename to modules/shepherd/support.scm
index 6591a25..dada505 100644
--- a/modules/dmd/support.scm
+++ b/modules/shepherd/support.scm
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd support)
- #:use-module (dmd config)
+(define-module (shepherd support)
+ #:use-module (shepherd config)
#:use-module (ice-9 match)
#:export (call/ec
caught-error
@@ -277,7 +277,7 @@ which has essential bindings pulled in."
;; The typical configuration file wants to do '(make <service> ...)', and
;; '(register-services ...)', so provide the relevant bindings by default.
(module-use! m (resolve-interface '(oop goops)))
- (module-use! m (resolve-interface '(dmd service)))
+ (module-use! m (resolve-interface '(shepherd service)))
m))
(define (load-in-user-module file)
diff --git a/modules/dmd/system.scm.in b/modules/shepherd/system.scm.in
similarity index 99%
rename from modules/dmd/system.scm.in
rename to modules/shepherd/system.scm.in
index 1576dc1..237dc10 100644
--- a/modules/dmd/system.scm.in
+++ b/modules/shepherd/system.scm.in
@@ -16,7 +16,7 @@
;; You should have received a copy of the GNU General Public License
;; along with the GNU Shepherd. If not, see <http://www.gnu.org/licenses/>.
-(define-module (dmd system)
+(define-module (shepherd system)
#:use-module (system foreign)
#:use-module (rnrs bytevectors)
#:export (reboot
diff --git a/tests/status-sexp.sh b/tests/status-sexp.sh
index fad5bbf..a436e0a 100644
--- a/tests/status-sexp.sh
+++ b/tests/status-sexp.sh
@@ -73,7 +73,7 @@ dmd_service_sexp="
(enabled? #t) (running #t) (last-respawns ()))"
"$GUILE" -c "
-(use-modules (dmd comm) (srfi srfi-1))
+(use-modules (shepherd comm) (srfi srfi-1))
(exit
(lset= equal? $fetch_status
@@ -95,7 +95,7 @@ dmd_service_sexp="
$deco unload dmd all
"$GUILE" -c "
-(use-modules (dmd comm))
+(use-modules (shepherd comm))
(exit
(equal? $fetch_status