[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/28: build-system/asdf: Make it possible to use "lib" as the build out
From: |
Ricardo Wurmus |
Subject: |
04/28: build-system/asdf: Make it possible to use "lib" as the build output. |
Date: |
Tue, 16 May 2017 09:24:33 -0400 (EDT) |
rekado pushed a commit to branch master
in repository guix.
commit 6c76ce39ac704d002a20539598e10d091f1611b0
Author: Andy Patterson <address@hidden>
Date: Mon Apr 3 09:01:21 2017 -0400
build-system/asdf: Make it possible to use "lib" as the build output.
* guix/build/asdf-build-system.scm (library-output): New procedure.
(copy-source, build, check, patch-asd-files, symlink-asd-files)
(cleanup-files): Use it.
(copy-files-to-output): Rework to take an output instead of an outputs and
string pair.
(install, copy-source): Use the new method.
---
guix/build/asdf-build-system.scm | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm
index c6770c4..10873e9 100644
--- a/guix/build/asdf-build-system.scm
+++ b/guix/build/asdf-build-system.scm
@@ -78,14 +78,18 @@ to it's binary output."
(define (source-asd-file output lisp name asd-file)
(string-append (lisp-source-directory output lisp name) "/" asd-file))
-(define (copy-files-to-output outputs output name)
- "Copy all files from OUTPUT to \"out\". Create an extra link to any
-system-defining files in the source to a convenient location. This is done
-before any compiling so that the compiled source locations will be valid."
- (let* ((out (assoc-ref outputs output))
- (source (getcwd))
- (target (source-directory out name))
- (system-path (string-append out %system-install-prefix)))
+(define (library-output outputs)
+ "If a `lib' output exists, build things there. Otherwise use `out'."
+ (or (assoc-ref outputs "lib") (assoc-ref outputs "out")))
+
+(define (copy-files-to-output out name)
+ "Copy all files from the current directory to OUT. Create an extra link to
+any system-defining files in the source to a convenient location. This is
+done before any compiling so that the compiled source locations will be
+valid."
+ (let ((source (getcwd))
+ (target (source-directory out name))
+ (system-path (string-append out %system-install-prefix)))
(copy-recursively source target)
(mkdir-p system-path)
(for-each
@@ -97,14 +101,14 @@ before any compiling so that the compiled source locations
will be valid."
(define* (install #:key outputs #:allow-other-keys)
"Copy and symlink all the source files."
- (copy-files-to-output outputs "out" (outputs->name outputs)))
+ (copy-files-to-output (assoc-ref outputs "out") (outputs->name outputs)))
(define* (copy-source #:key outputs lisp #:allow-other-keys)
- "Copy the source to \"out\"."
- (let* ((out (assoc-ref outputs "out"))
+ "Copy the source to the library output."
+ (let* ((out (library-output outputs))
(name (remove-lisp-from-name (output-path->package-name out) lisp))
(install-path (string-append out %source-install-prefix)))
- (copy-files-to-output outputs "out" name)
+ (copy-files-to-output out name)
;; Hide the files from asdf
(with-directory-excursion install-path
(rename-file "source" (string-append lisp "-source"))
@@ -114,7 +118,7 @@ before any compiling so that the compiled source locations
will be valid."
(define* (build #:key outputs inputs lisp asd-file
#:allow-other-keys)
"Compile the system."
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((out (library-output outputs))
(name (remove-lisp-from-name (output-path->package-name out) lisp))
(source-path (lisp-source-directory out lisp name))
(translations (wrap-output-translations
@@ -148,7 +152,7 @@ before any compiling so that the compiled source locations
will be valid."
#:allow-other-keys)
"Test the system."
(let* ((name (remove-lisp-from-name (outputs->name outputs) lisp))
- (out (assoc-ref outputs "out"))
+ (out (library-output outputs))
(asd-file (and=> asd-file (cut source-asd-file out lisp name <>))))
(if tests?
(parameterize ((%lisp (string-append
@@ -167,7 +171,7 @@ before any compiling so that the compiled source locations
will be valid."
find their dependencies. Exclude any TEST-ONLY-SYSTEMS which were only
included to run tests. Add any SPECIAL-DEPENDENCIES which the LISP
implementation itself provides."
- (let* ((out (assoc-ref outputs "out"))
+ (let* ((out (library-output outputs))
(name (remove-lisp-from-name (output-path->package-name out) lisp))
(registry (lset-difference
(lambda (input system)
@@ -186,7 +190,7 @@ implementation itself provides."
(define* (symlink-asd-files #:key outputs lisp #:allow-other-keys)
"Create an extra reference to the system in a convenient location."
- (let* ((out (assoc-ref outputs "out")))
+ (let* ((out (library-output outputs)))
(for-each
(lambda (asd-file)
(substitute* asd-file
@@ -208,7 +212,7 @@ implementation itself provides."
(define* (cleanup-files #:key outputs lisp
#:allow-other-keys)
"Remove any compiled files which are not a part of the final bundle."
- (let ((out (assoc-ref outputs "out")))
+ (let ((out (library-output outputs)))
(match lisp
("sbcl"
(for-each
- branch master updated (7ee7ee1 -> 6db77c7), Ricardo Wurmus, 2017/05/16
- 02/28: gnu: cl-slynk: Explain some naming choices., Ricardo Wurmus, 2017/05/16
- 08/28: build-system/asdf: Keep ecl's generated archive files., Ricardo Wurmus, 2017/05/16
- 03/28: build-system/asdf: Rename %install-prefix to %source-install-prefix., Ricardo Wurmus, 2017/05/16
- 01/28: gnu: cl-slynk: Clarify the description., Ricardo Wurmus, 2017/05/16
- 04/28: build-system/asdf: Make it possible to use "lib" as the build output.,
Ricardo Wurmus <=
- 17/28: gnu: sbcl-slynk-boot0: Give the package an appropriate name., Ricardo Wurmus, 2017/05/16
- 21/28: gnu: java-stringtemplate-3: Do not hardcode version string., Ricardo Wurmus, 2017/05/16
- 25/28: gnu: stringtemplate4: Prettify "generate-grammar" phase., Ricardo Wurmus, 2017/05/16
- 18/28: build-system/asdf: Handle tests defined in external systems., Ricardo Wurmus, 2017/05/16
- 14/28: gnu: Add cl-unicode., Ricardo Wurmus, 2017/05/16
- 06/28: build-system/asdf: Use asdf to determine dependencies., Ricardo Wurmus, 2017/05/16
- 05/28: gnu: cl-stumpwm: Build the library in "lib" and the program in "bin"., Ricardo Wurmus, 2017/05/16
- 11/28: build-system/asdf: Pass the system name as an argument to the builder., Ricardo Wurmus, 2017/05/16
- 23/28: gnu: java-stringtemplate-3: Use return value in build phase., Ricardo Wurmus, 2017/05/16
- 12/28: build-system/asdf: Always pre-load the system's definition file., Ricardo Wurmus, 2017/05/16