futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system: asdf: Read all .asd files if no #:asd-files specified.

Browse Source 
* guix/build-system/asdf.scm (asdf-build): Remove the 'files' variable.
* guix/build/asd-build-system.scm (find-asd-files): New variable.
  (build, check): Use it.
This commit is contained in:
Guillaume Le Vaillant 2020-09-15 14:36:24 +02:00
parent e7cbcf5aff
commit 952fafb2a3
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,7 @@ set up using CL source package conventions."
(imported-modules %asdf-build-system-modules)
(modules %asdf-build-modules))
;; FIXME: The definitions of 'systems' and 'files' are pretty hacky.
;; FIXME: The definition of 'systems' is pretty hacky.
;; Is there a more elegant way to do it?
(define systems
(if (null? (cadr asd-systems))
@ -303,13 +303,6 @@ set up using CL source package conventions."
(1+ (string-length lisp-type))))) ; drop the "<lisp>-" prefix.
asd-systems))
(define files
(if (null? (cadr asd-files))
`(quote ,(map (lambda (system)
(string-append system ".asd"))
(cadr systems)))
asd-files))
(define builder
`(begin
(use-modules ,@modules)
@ -323,7 +316,7 @@ set up using CL source package conventions."
(derivation->output-path source))
((source) source)
(source source))
#:asd-files ,files
#:asd-files ,asd-files
#:asd-systems ,systems
#:test-asd-file ,test-asd-file
#:system ,system

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

@ -81,6 +81,13 @@ to it's binary output."
(define (source-asd-file output name asd-file)
(string-append (lisp-source-directory output name) "/" asd-file))
(define (find-asd-files output name asd-files)
(if (null? asd-files)
(find-files (lisp-source-directory output name) "\\.asd$")
(map (lambda (asd-file)
(source-asd-file output name asd-file))
asd-files)))
(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
@ -189,9 +196,7 @@ if it's present in the native-inputs."
(translations (wrap-output-translations
`(,(output-translation source-path
out))))
(asd-files (map (lambda (asd-file)
(source-asd-file out system-name asd-file))
asd-files)))
(asd-files (find-asd-files out system-name asd-files)))
(setenv "ASDF_OUTPUT_TRANSLATIONS"
(replace-escaped-macros (format #f "~S" translations)))
(setenv "HOME" out) ; ecl's asdf sometimes wants to create $HOME/.cache
@ -204,9 +209,7 @@ if it's present in the native-inputs."
"Test the system."
(let* ((out (library-output outputs))
(system-name (main-system-name out))
(asd-files (map (lambda (asd-file)
(source-asd-file out system-name asd-file))
asd-files))
(asd-files (find-asd-files out system-name asd-files))
(test-asd-file
(and=> test-asd-file
(cut source-asd-file out system-name <>))))