me
/
guix
Archived
1
0
Fork 0
Code

build-system/asdf: Rename %install-prefix to %source-install-prefix. 

* guix/build/lisp-utils.scm (%install-prefix): Rename to
%source-install-prefix.
(build-install-prefix): Use it.
* guix/build/asdf-build-system.scm (source-install-prefix)
(%system-install-prefix, source-directory, copy-source): Likewise.
master
Andy Patterson 2017-04-03 09:01:20 -04:00 committed by Ricardo Wurmus
parent 75e8b3af69
commit bc389c20a9
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build/asdf-build-system.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -43,10 +43,10 @@
(define %object-prefix "/lib") (define %object-prefix "/lib")
(define (source-install-prefix lisp) (define (source-install-prefix lisp)
(string-append %install-prefix "/" lisp "-source")) (string-append %source-install-prefix "/" lisp "-source"))
(define %system-install-prefix (define %system-install-prefix
(string-append %install-prefix "/systems")) (string-append %source-install-prefix "/systems"))
(define (output-path->package-name path) (define (output-path->package-name path)
(package-name->name+version (strip-store-file-name path))) (package-name->name+version (strip-store-file-name path)))
@ -59,7 +59,7 @@
(string-append output (source-install-prefix lisp) "/" name)) (string-append output (source-install-prefix lisp) "/" name))
(define (source-directory output name) (define (source-directory output name)
(string-append output %install-prefix "/source/" name)) (string-append output %source-install-prefix "/source/" name))
(define (library-directory output lisp) (define (library-directory output lisp)
(string-append output %object-prefix (string-append output %object-prefix
@ -103,7 +103,7 @@ before any compiling so that the compiled source locations will be valid."
"Copy the source to \"out\"." "Copy the source to \"out\"."
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(name (remove-lisp-from-name (output-path->package-name out) lisp)) (name (remove-lisp-from-name (output-path->package-name out) lisp))
(install-path (string-append out %install-prefix))) (install-path (string-append out %source-install-prefix)))
(copy-files-to-output outputs "out" name) (copy-files-to-output outputs "out" name)
;; Hide the files from asdf ;; Hide the files from asdf
(with-directory-excursion install-path (with-directory-excursion install-path

10
guix/build/lisp-utils.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter@uwaterloo.ca>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,7 +24,7 @@
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)
#:use-module (guix build utils) #:use-module (guix build utils)
#:export (%lisp #:export (%lisp
%install-prefix %source-install-prefix
lisp-eval-program lisp-eval-program
compile-system compile-system
test-system test-system
@ -54,10 +54,12 @@
;; File name of the Lisp compiler. ;; File name of the Lisp compiler.
(make-parameter "lisp")) (make-parameter "lisp"))
(define %install-prefix "/share/common-lisp") ;; The common parent for Lisp source files, as will as the symbolic
;; link farm for system definition (.asd) files.
(define %source-install-prefix "/share/common-lisp")
(define (bundle-install-prefix lisp) (define (bundle-install-prefix lisp)
(string-append %install-prefix "/" lisp "-bundle-systems")) (string-append %source-install-prefix "/" lisp "-bundle-systems"))
(define (remove-lisp-from-name name lisp) (define (remove-lisp-from-name name lisp)
(string-drop name (1+ (string-length lisp)))) (string-drop name (1+ (string-length lisp))))