From f84218acae6cb323c6c9f7d5957531dae9b9912f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 26 Feb 2015 23:00:21 +0100 Subject: [PATCH] build-system: Use 'modify-phases'. * guix/build/cmake-build-system.scm (%standard-phases): Use 'modify-phases' instead of alist-*. * guix/build/glib-or-gtk-build-system.scm (%standard-phases): Likewise. * guix/build/gnu-dist.scm (%dist-phases): Likewise. * guix/build/perl-build-system.scm (%standard-phases): Likewise. * guix/build/python-build-system.scm (%standard-phases): Likewise. * guix/build/ruby-build-system.scm (%standard-phases): Likewise. * guix/build/waf-build-system.scm (%standard-phases): Likewise. --- guix/build/cmake-build-system.scm | 8 ++++---- guix/build/glib-or-gtk-build-system.scm | 11 ++++------- guix/build/gnu-dist.scm | 17 +++++++---------- guix/build/perl-build-system.scm | 16 ++++++---------- guix/build/python-build-system.scm | 22 ++++++++-------------- guix/build/ruby-build-system.scm | 12 +++++------- guix/build/waf-build-system.scm | 13 +++++-------- 7 files changed, 39 insertions(+), 60 deletions(-) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 74b4f01425..07fd8df481 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Andreas Enge ;;; @@ -72,9 +72,9 @@ (define %standard-phases ;; Everything is as with the GNU Build System except for the `configure' ;; and 'check' phases. - (alist-replace 'configure configure - (alist-replace 'check check - gnu:%standard-phases))) + (modify-phases gnu:%standard-phases + (replace check check) + (replace configure configure))) (define* (cmake-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/glib-or-gtk-build-system.scm b/guix/build/glib-or-gtk-build-system.scm index 92e91bf7a5..c57bc3e731 100644 --- a/guix/build/glib-or-gtk-build-system.scm +++ b/guix/build/glib-or-gtk-build-system.scm @@ -239,13 +239,10 @@ needed." outputs)) (define %standard-phases - (alist-cons-after - 'install 'glib-or-gtk-wrap wrap-all-programs - (alist-cons-after - 'install 'glib-or-gtk-icon-cache generate-icon-cache - (alist-cons-after - 'install 'glib-or-gtk-compile-schemas compile-glib-schemas - gnu:%standard-phases)))) + (modify-phases gnu:%standard-phases + (add-after install glib-or-gtk-compile-schemas compile-glib-schemas) + (add-after install glib-or-gtk-icon-cache generate-icon-cache) + (add-after install glib-or-gtk-wrap wrap-all-programs))) (define* (glib-or-gtk-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/gnu-dist.scm b/guix/build/gnu-dist.scm index 562056b5f6..887b5e94e9 100644 --- a/guix/build/gnu-dist.scm +++ b/guix/build/gnu-dist.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,14 +82,11 @@ (define %dist-phases ;; Phases for building a source tarball. - (alist-replace - 'unpack copy-source - (alist-cons-before - 'configure 'autoreconf autoreconf - (alist-replace - 'build build - (alist-replace - 'install install-dist - (alist-delete 'strip %standard-phases)))))) + (modify-phases %standard-phases + (delete strip) + (replace install install-dist) + (replace build build) + (add-before configure autoreconf autoreconf) + (replace unpack copy-source))) ;;; gnu-dist.scm ends here diff --git a/guix/build/perl-build-system.scm b/guix/build/perl-build-system.scm index 7eb944ccd1..9ca5353bb9 100644 --- a/guix/build/perl-build-system.scm +++ b/guix/build/perl-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2015 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,15 +71,11 @@ (define %standard-phases ;; Everything is as with the GNU Build System except for the `configure', ;; `build', `check', and `install' phases. - (alist-replace - 'configure configure - (alist-replace - 'build build - (alist-replace - 'check check - (alist-replace - 'install install - gnu:%standard-phases))))) + (modify-phases gnu:%standard-phases + (replace install install) + (replace check check) + (replace build build) + (replace configure configure))) (define* (perl-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 74ba0c765d..9f853134bd 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; @@ -122,19 +122,13 @@ installed with setuptools." (define %standard-phases ;; 'configure' and 'build' phases are not needed. Everything is done during ;; 'install'. - (alist-cons-before - 'strip 'rename-pth-file - rename-pth-file - (alist-cons-after - 'install 'wrap - wrap - (alist-replace - 'build build - (alist-replace - 'check check - (alist-replace 'install install - (alist-delete 'configure - gnu:%standard-phases))))))) + (modify-phases gnu:%standard-phases + (delete configure) + (replace install install) + (replace check check) + (replace build build) + (add-after install wrap wrap) + (add-before strip rename-pth-file rename-pth-file))) (define* (python-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm index 2b3ba7c8cd..40aa974dee 100644 --- a/guix/build/ruby-build-system.scm +++ b/guix/build/ruby-build-system.scm @@ -62,13 +62,11 @@ directory." (first-matching-file "\\.gem$"))))) (define %standard-phases - (alist-replace - 'build build - (alist-replace - 'install install - (alist-replace - 'check check - (alist-delete 'configure gnu:%standard-phases))))) + (modify-phases gnu:%standard-phases + (delete configure) + (replace build build) + (replace install install) + (replace check check))) (define* (ruby-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) diff --git a/guix/build/waf-build-system.scm b/guix/build/waf-build-system.scm index e64b51abc0..d172c5a836 100644 --- a/guix/build/waf-build-system.scm +++ b/guix/build/waf-build-system.scm @@ -69,14 +69,11 @@ (call-waf "install" params))) (define %standard-phases - (alist-replace - 'configure configure - (alist-replace - 'build build - (alist-replace - 'check check - (alist-replace 'install install - gnu:%standard-phases))))) + (modify-phases gnu:%standard-phases + (replace configure configure) + (replace build build) + (replace check check) + (replace install install))) (define* (waf-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args)