guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[shepherd] 09/09: Remove utils.


From: Alex Kost
Subject: [shepherd] 09/09: Remove utils.
Date: Tue, 26 Jan 2016 09:40:28 +0000

alezost pushed a commit to branch master
in repository shepherd.

commit cf8a3c21d817cf35f0c021bc82ff4042a78f2d22
Author: Alex Kost <address@hidden>
Date:   Tue Jan 26 12:20:19 2016 +0300

    Remove utils.
    
    * utils/Makefile.am: Remove file.
    * utils/dmd-gettext.scm: Remove file.
    * utils/sysvconfig.scm: Remove file.
    * Makefile.am (SUBDIRS): Remove 'utils'.
    * configure.ac: Remove 'utils/Makefile'.
    * .gitignore: Likewise.
---
 .gitignore            |    1 -
 Makefile.am           |    2 +-
 configure.ac          |    1 -
 utils/Makefile.am     |    3 --
 utils/dmd-gettext.scm |   61 -------------------------------------------------
 utils/sysvconfig.scm  |   49 ---------------------------------------
 6 files changed, 1 insertions(+), 116 deletions(-)

diff --git a/.gitignore b/.gitignore
index a25f8df..fd74e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@
 /herd
 /shepherd
 /examples/Makefile
-/utils/Makefile
 /autom4te.cache
 /build-aux/*
 Makefile.in
diff --git a/Makefile.am b/Makefile.am
index df97916..6743904 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,7 @@ CLEANFILES =                                          \
 
 # Documentation.
 info_TEXINFOS = shepherd.texi
-SUBDIRS = examples utils
+SUBDIRS = examples
 
 # Things not automatically included in the distribution.
 EXTRA_DIST = $(templates) QUESTIONS fdl-1.3.texi ChangeLog-2003
diff --git a/configure.ac b/configure.ac
index 478994c..75ddb30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,6 @@ AC_MSG_RESULT([done])
 dnl Finish.
 AC_CONFIG_FILES([Makefile
                  examples/Makefile
-                utils/Makefile
                 modules/shepherd/system.scm])
 
 AC_OUTPUT
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 4e8179d..0000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# utils/Makefile.am -- Utility programs.
-
-EXTRA_DIST = dmd-gettext.scm sysvconfig.scm
diff --git a/utils/dmd-gettext.scm b/utils/dmd-gettext.scm
deleted file mode 100644
index 72d6441..0000000
--- a/utils/dmd-gettext.scm
+++ /dev/null
@@ -1,61 +0,0 @@
-;; dmd-gettext.scm -- Extract translatable strings from source code.
-;; Copyright (C) 2002 Wolfgang J�hrling <address@hidden>
-;;
-;; This file is part of the GNU Shepherd.
-;;
-;; The GNU Shepherd is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or (at
-;; your option) any later version.
-;;
-;; The GNU Shepherd is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; 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 l10n-keywords '(l10n local-output))
-
-(define (puts . text)
-  (for-each display text)
-  (newline))
-
-(define (found-string str orig)
-  (puts "#: " (source-property orig 'filename)
-       ":" (source-property orig 'line))
-  (puts "msgid \"" str "\"")
-  (puts "msgstr \"\"")
-  (puts))
-
-(define (extract-strings port)
-  (letrec ((next-expr
-           (lambda (data)
-             (or (eof-object? data)
-                 (begin
-                   (letrec ((look-at
-                             (lambda (expr)
-                               (if (and (list? expr)
-                                        (not (null? expr)))
-                                   (begin
-                                     (and (memq (car expr)
-                                                l10n-keywords)
-                                          (found-string (cadr expr) expr))
-                                     (for-each look-at expr))
-                                   (and (pair? expr)
-                                        (begin
-                                          (look-at (car expr))
-                                          (look-at (cdr expr))))))))
-                     (look-at data))
-                   (next-expr (read port)))))))
-    (next-expr (read port))))
-
-;; Safe file positions of the expressions we read.  It is enabled by
-;; default, but we want to be sure.
-(read-enable 'positions)
-
-;; Iterate over all given files.
-(for-each extract-strings
-         (map open-input-file
-              (cdr (command-line))))
diff --git a/utils/sysvconfig.scm b/utils/sysvconfig.scm
deleted file mode 100644
index 4f6106f..0000000
--- a/utils/sysvconfig.scm
+++ /dev/null
@@ -1,49 +0,0 @@
-;; sysvconfig.scm -- Absorb an existing System V Init configuration.
-;; Copyright (C) 2002 Wolfgang J�hrling <address@hidden>
-;;
-;; This file is part of the GNU Shepherd.
-;;
-;; The GNU Shepherd is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or (at
-;; your option) any later version.
-;;
-;; The GNU Shepherd is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-;;
-;; 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/>.
-
-(use-modules (ice-9 pretty-print))
-
-(define services-dir "/etc/init.d")
-
-;; Return symbolic expressions representing the SysVInit config.
-(define (make-config)
-  `(register-services
-    ,@(init.d-services)))
-
-(define (init.d-services)
-  (let ((dir (opendir services-dir)))
-    (letrec ((next-entry
-             (lambda (new-entry entries)
-               (if (eof-object? new-entry)
-                   entries
-                   (next-entry (readdir dir)
-                               (if (member new-entry '("." ".."))
-                                   entries
-                                   (cons `(make-init.d-service ,new-entry)
-                                         entries)))))))
-      (next-entry (readdir dir) '()))))
-
-;; The header comment, placing no restrictions on the output.
-(display ";; This file was generated by sysvconfig.scm
-;; Unlimited permission is granted to distribute and/or modify this
-;; file and to place additional restrictions on the further
-;; distribution and/or modification.
-
-")
-
-(pretty-print (make-config))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]