nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2015-02-26 23:00:21 +01:00
parent 8ddc41e1f2
commit f84218acae
7 changed files with 39 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
guix/build/cmake-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; ;;;
@ -72,9 +72,9 @@
(define %standard-phases (define %standard-phases
;; Everything is as with the GNU Build System except for the `configure' ;; Everything is as with the GNU Build System except for the `configure'
;; and 'check' phases. ;; and 'check' phases.
(alist-replace 'configure configure (modify-phases gnu:%standard-phases
(alist-replace 'check check (replace check check)
gnu:%standard-phases))) (replace configure configure)))
(define* (cmake-build #:key inputs (phases %standard-phases) (define* (cmake-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)

11
guix/build/glib-or-gtk-build-system.scm
View File

@ -239,13 +239,10 @@ needed."
outputs)) outputs))
(define %standard-phases (define %standard-phases
(alist-cons-after (modify-phases gnu:%standard-phases
'install 'glib-or-gtk-wrap wrap-all-programs (add-after install glib-or-gtk-compile-schemas compile-glib-schemas)
(alist-cons-after (add-after install glib-or-gtk-icon-cache generate-icon-cache)
'install 'glib-or-gtk-icon-cache generate-icon-cache (add-after install glib-or-gtk-wrap wrap-all-programs)))
(alist-cons-after
'install 'glib-or-gtk-compile-schemas compile-glib-schemas
gnu:%standard-phases))))
(define* (glib-or-gtk-build #:key inputs (phases %standard-phases) (define* (glib-or-gtk-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)

17
guix/build/gnu-dist.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -82,14 +82,11 @@
(define %dist-phases (define %dist-phases
;; Phases for building a source tarball. ;; Phases for building a source tarball.
(alist-replace (modify-phases %standard-phases
'unpack copy-source (delete strip)
(alist-cons-before (replace install install-dist)
'configure 'autoreconf autoreconf (replace build build)
(alist-replace (add-before configure autoreconf autoreconf)
'build build (replace unpack copy-source)))
(alist-replace
'install install-dist
(alist-delete 'strip %standard-phases))))))
;;; gnu-dist.scm ends here ;;; gnu-dist.scm ends here

16
guix/build/perl-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -71,15 +71,11 @@
(define %standard-phases (define %standard-phases
;; Everything is as with the GNU Build System except for the `configure', ;; Everything is as with the GNU Build System except for the `configure',
;; `build', `check', and `install' phases. ;; `build', `check', and `install' phases.
(alist-replace (modify-phases gnu:%standard-phases
'configure configure (replace install install)
(alist-replace (replace check check)
'build build (replace build build)
(alist-replace (replace configure configure)))
'check check
(alist-replace
'install install
gnu:%standard-phases)))))
(define* (perl-build #:key inputs (phases %standard-phases) (define* (perl-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)

22
guix/build/python-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
;;; ;;;
@ -122,19 +122,13 @@ installed with setuptools."
(define %standard-phases (define %standard-phases
;; 'configure' and 'build' phases are not needed. Everything is done during ;; 'configure' and 'build' phases are not needed. Everything is done during
;; 'install'. ;; 'install'.
(alist-cons-before (modify-phases gnu:%standard-phases
'strip 'rename-pth-file (delete configure)
rename-pth-file (replace install install)
(alist-cons-after (replace check check)
'install 'wrap (replace build build)
wrap (add-after install wrap wrap)
(alist-replace (add-before strip rename-pth-file rename-pth-file)))
'build build
(alist-replace
'check check
(alist-replace 'install install
(alist-delete 'configure
gnu:%standard-phases)))))))
(define* (python-build #:key inputs (phases %standard-phases) (define* (python-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)

12
guix/build/ruby-build-system.scm
View File

@ -62,13 +62,11 @@ directory."
(first-matching-file "\\.gem$"))))) (first-matching-file "\\.gem$")))))
(define %standard-phases (define %standard-phases
(alist-replace (modify-phases gnu:%standard-phases
'build build (delete configure)
(alist-replace (replace build build)
'install install (replace install install)
(alist-replace (replace check check)))
'check check
(alist-delete 'configure gnu:%standard-phases)))))
(define* (ruby-build #:key inputs (phases %standard-phases) (define* (ruby-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)

13
guix/build/waf-build-system.scm
View File

@ -69,14 +69,11 @@
(call-waf "install" params))) (call-waf "install" params)))
(define %standard-phases (define %standard-phases
(alist-replace (modify-phases gnu:%standard-phases
'configure configure (replace configure configure)
(alist-replace (replace build build)
'build build (replace check check)
(alist-replace (replace install install)))
'check check
(alist-replace 'install install
gnu:%standard-phases)))))
(define* (waf-build #:key inputs (phases %standard-phases) (define* (waf-build #:key inputs (phases %standard-phases)
#:allow-other-keys #:rest args) #:allow-other-keys #:rest args)