From: Mathieu Lirzin <mthl@gnu.org>
To: 30147@debbugs.gnu.org
Subject: [bug#30147] Simplify “scripts/guix”
Date: Wed, 17 Jan 2018 20:25:14 +0100 [thread overview]
Message-ID: <87inc0i8yt.fsf@gnu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 61 bytes --]
Hi,
Here are some improvements for “scripts/guix”.
[-- Attachment #2: 0001-build-Expand-scripts-guix-at-Make-time.patch --]
[-- Type: text/x-patch, Size: 5779 bytes --]
From 342444897673d5f9d9a475986e76ca2e912f6674 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Wed, 17 Jan 2018 17:14:24 +0100
Subject: [PATCH 1/2] =?UTF-8?q?build:=20Expand=20=E2=80=98scripts/guix?=
=?UTF-8?q?=E2=80=99=20at=20Make=20time.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This moves the complexity of Autotools variable expansion outside of the
application code.
* scripts/guix.in (config-lookup): Delete.
(maybe-augment-load-paths!, run-guix-main): Use fully expanded variables
instead of calling ‘config-lookup’.
* configure.ac: Don't use AC_CONFIG_FILES for ‘scripts/guix’.
* Makefile.am (scripts/guix): New rule.
(do_subst): New variable.
(CLEANFILES, EXTRA_DIST): Adapt.
---
Makefile.am | 20 +++++++++++++++++---
configure.ac | 1 -
scripts/guix.in | 31 ++++++-------------------------
3 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index aebd3b1eb..5e36dbf44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
# Copyright © 2015, 2017 Alex Kost <alezost@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+# Copyright © 2016, 2018 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2016, 2017 Mark H Weaver <mhw@netris.org>
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
# Copyright © 2017 Leo Famulari <leo@famulari.name>
@@ -26,8 +26,20 @@
# You should have received a copy of the GNU General Public License
# along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
-bin_SCRIPTS = \
- scripts/guix
+bin_SCRIPTS = scripts/guix
+
+# Handle substitution of fully-expanded Autoconf variables.
+do_subst = sed \
+ -e 's,[@]GUILE[@],$(GUILE),g' \
+ -e 's,[@]guilemoduledir[@],$(guilemoduledir),g' \
+ -e 's,[@]guileobjectdir[@],$(guileobjectdir),g' \
+ -e 's,[@]localedir[@],$(localedir),g'
+
+scripts/guix: scripts/guix.in Makefile
+ $(AM_V_GEN)rm -f $@ $@-t \
+ && $(MKDIR_P) $(@D) \
+ && $(do_subst) <$(srcdir)/$@.in >$@-t \
+ && chmod a+x,a-w $@-t && mv -f $@-t $@
nodist_noinst_SCRIPTS = \
pre-inst-env \
@@ -437,6 +449,7 @@ EXTRA_DIST = \
TODO \
CODE-OF-CONDUCT \
.dir-locals.el \
+ bin/guix.in \
build-aux/build-self.scm \
build-aux/compile-all.scm \
build-aux/hydra/evaluate.scm \
@@ -473,6 +486,7 @@ endif !BUILD_DAEMON_OFFLOAD
CLEANFILES = \
+ $(bin_SCRIPTS) \
$(GOBJECTS) \
$(SCM_TESTS:tests/%.scm=%.log)
diff --git a/configure.ac b/configure.ac
index 1e3912248..c50dcaf2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,7 +272,6 @@ AC_CONFIG_FILES([Makefile
po/packages/Makefile.in
guix/config.scm])
-AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
[chmod +x pre-inst-env])
diff --git a/scripts/guix.in b/scripts/guix.in
index e20c27424..af50a782b 100644
--- a/scripts/guix.in
+++ b/scripts/guix.in
@@ -3,6 +3,7 @@
!#
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2018 Mathieu Lirzin <mthl@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -22,35 +23,15 @@
;; IMPORTANT: We must avoid loading any modules from Guix here,
;; because we need to adjust the guile load paths first.
;; It's okay to import modules from core Guile though.
-(use-modules (ice-9 regex)
- (srfi srfi-26))
+(use-modules (srfi srfi-26))
(let ()
(define-syntax-rule (push! elt v) (set! v (cons elt v)))
- (define config-lookup
- (let ((config '(("prefix" . "@prefix@")
- ("exec_prefix" . "@exec_prefix@")
- ("datarootdir" . "@datarootdir@")
- ("guilemoduledir" . "@guilemoduledir@")
- ("guileobjectdir" . "@guileobjectdir@")
- ("localedir" . "@localedir@")))
- (var-ref-regexp (make-regexp "\\$\\{([a-z_]+)\\}")))
- (define (expand-var-ref match)
- (lookup (match:substring match 1)))
- (define (expand str)
- (regexp-substitute/global #f var-ref-regexp str
- 'pre expand-var-ref 'post))
- (define (lookup name)
- (expand (assoc-ref config name)))
- lookup))
-
(define (maybe-augment-load-paths!)
(unless (getenv "GUIX_UNINSTALLED")
- (let ((module-dir (config-lookup "guilemoduledir"))
- (object-dir (config-lookup "guileobjectdir")))
- (push! module-dir %load-path)
- (push! object-dir %load-compiled-path))
+ (push! "@guilemoduledir@" %load-path)
+ (push! "@guileobjectdir@" %load-compiled-path)
(let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
(and=> (getenv "HOME")
(cut string-append <> "/.config")))
@@ -64,8 +45,8 @@
(define (run-guix-main)
(let ((guix-main (module-ref (resolve-interface '(guix ui))
'guix-main)))
- (bindtextdomain "guix" (config-lookup "localedir"))
- (bindtextdomain "guix-packages" (config-lookup "localedir"))
+ (bindtextdomain "guix" "@localedir@")
+ (bindtextdomain "guix-packages" "@localedir@")
(apply guix-main (command-line))))
(maybe-augment-load-paths!)
--
2.15.1
[-- Attachment #3: 0002-guix-Refactor-script.patch --]
[-- Type: text/x-patch, Size: 3307 bytes --]
From b6f8331455da1ffc4896b06cd2ee98e09b05be43 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Wed, 17 Jan 2018 19:55:49 +0100
Subject: [PATCH 2/2] guix: Refactor script.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* scripts/guix.in: Use ‘and-let*’ and remove empty surrounding ‘let’.
(run-guix-main, maybe-augment-load-paths!): Inline them.
---
scripts/guix.in | 45 +++++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 24 deletions(-)
diff --git a/scripts/guix.in b/scripts/guix.in
index af50a782b..f971398e8 100644
--- a/scripts/guix.in
+++ b/scripts/guix.in
@@ -23,36 +23,33 @@
;; IMPORTANT: We must avoid loading any modules from Guix here,
;; because we need to adjust the guile load paths first.
;; It's okay to import modules from core Guile though.
-(use-modules (srfi srfi-26))
-(let ()
- (define-syntax-rule (push! elt v) (set! v (cons elt v)))
+(use-modules (srfi srfi-2)
+ (srfi srfi-26))
- (define (maybe-augment-load-paths!)
- (unless (getenv "GUIX_UNINSTALLED")
- (push! "@guilemoduledir@" %load-path)
- (push! "@guileobjectdir@" %load-compiled-path)
- (let ((updates-dir (and=> (or (getenv "XDG_CONFIG_HOME")
- (and=> (getenv "HOME")
- (cut string-append <> "/.config")))
- (cut string-append <> "/guix/latest"))))
- (when (and updates-dir (file-exists? updates-dir))
- ;; XXX: Currently 'guix pull' puts both .scm and .go files in
- ;; UPDATES-DIR.
- (push! updates-dir %load-path)
- (push! updates-dir %load-compiled-path)))))
+(define-syntax-rule (push! elt v) (set! v (cons elt v)))
- (define (run-guix-main)
- (let ((guix-main (module-ref (resolve-interface '(guix ui))
- 'guix-main)))
- (bindtextdomain "guix" "@localedir@")
- (bindtextdomain "guix-packages" "@localedir@")
- (apply guix-main (command-line))))
+(unless (getenv "GUIX_UNINSTALLED")
+ ;; Add installed modules to load-path.
+ (push! "@guilemoduledir@" %load-path)
+ (push! "@guileobjectdir@" %load-compiled-path)
- (maybe-augment-load-paths!)
+ ;; Add modules fetched by 'guix pull' to load-path.
+ (and-let* ((conf-dir (or (getenv "XDG_CONFIG_HOME")
+ (and=> (getenv "HOME")
+ (cut string-append <> "/.config"))))
+ (updates-dir (string-append conf-dir "/guix/latest"))
+ ((file-exists? updates-dir)))
+ ;; XXX: Currently 'guix pull' puts both .scm and .go files in UPDATES-DIR.
+ (push! updates-dir %load-path)
+ (push! updates-dir %load-compiled-path)))
+;; Run Guix.
+(let ((guix-main (module-ref (resolve-interface '(guix ui)) 'guix-main)))
+ (bindtextdomain "guix" "@localedir@")
+ (bindtextdomain "guix-packages" "@localedir@")
;; XXX: It would be more convenient to change it to:
;; (exit (run-guix-main))
;; but since the 'guix' command is not updated by 'guix pull', we cannot
;; really do it now.
- (run-guix-main))
+ (apply guix-main (command-line)))
--
2.15.1
[-- Attachment #4: Type: text/plain, Size: 85 bytes --]
Thanks.
--
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761 070D 0ADE E100 9460 4D37
next reply other threads:[~2018-01-17 19:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-17 19:25 Mathieu Lirzin [this message]
2018-01-22 18:19 ` [bug#30147] Simplify “scripts/guix” Eric Bavier
2018-01-23 11:06 ` Mathieu Lirzin
2018-01-23 9:13 ` bug#30147: " Ludovic Courtès
2018-01-23 12:29 ` [bug#30147] " Mathieu Lirzin
2018-01-23 14:01 ` Ludovic Courtès
2018-01-24 11:45 ` Mathieu Lirzin
2018-01-24 13:46 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87inc0i8yt.fsf@gnu.org \
--to=mthl@gnu.org \
--cc=30147@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.