diff mbox series

[bug#66815] build-system/guile: Add target-guile-scm+go procedure.

Message ID fe224012362e61b9e6408fd36b02985f8bb4e092.1698584173.git.wolf@wolfsden.cz
State New
Headers show
Series [bug#66815] build-system/guile: Add target-guile-scm+go procedure. | expand

Commit Message

Tomas Volf Oct. 29, 2023, 12:56 p.m. UTC 
The paths to .scm and .go files can be constructed given a guile version and a
base directory.  However it is few lines of code that needs to be copy&pasted.
This new procedure returns both of them reducing the maintenance cost.

* guix/build/guile-build-system.scm (target-guile-scm+go): New procedure.

Change-Id: I58615f2cfe0ec1e58d3fbb47b738ed5dce1bb252
---
This procedure is handy both for executing tests on installed files in
guile-build-system and to set environment variables in wrappers.

 guix/build/guile-build-system.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)


base-commit: ac01fef9ff3efb48e60e80930743888b0e79be66

Comments

Ludovic Courtès Nov. 15, 2023, 5:19 p.m. UTC | #1 
Hi Tomas! :-)

Tomas Volf <wolf@wolfsden.cz> skribis:

> The paths to .scm and .go files can be constructed given a guile version and a
> base directory.  However it is few lines of code that needs to be copy&pasted.
> This new procedure returns both of them reducing the maintenance cost.
>
> * guix/build/guile-build-system.scm (target-guile-scm+go): New procedure.
>
> Change-Id: I58615f2cfe0ec1e58d3fbb47b738ed5dce1bb252

Applied, thanks!

Ludo’.
diff mbox series

Patch

diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm
index 32a431d347..e7e7f2d0be 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -28,6 +28,7 @@  (define-module (guix build guile-build-system)
   #:use-module (ice-9 format)
   #:use-module (guix build utils)
   #:export (target-guile-effective-version
+            target-guile-scm+go
             %standard-phases
             guile-build))
 
@@ -44,7 +45,17 @@  (define* (target-guile-effective-version #:optional guile)
          (string? line)
          line)))
 
-(define (file-sans-extension file)                ;TODO: factorize
+(define* (target-guile-scm+go output #:optional guile)
+  "Return paths under `output' for scm and go files for effective version of
+GUILE or whichever `guile' is in $PATH.  Raises an error if they cannot be
+determined."
+  (let* ((version (or (target-guile-effective-version guile)
+                      (error "Cannot determine the effective target guile version.")))
+         (scm (string-append output "/share/guile/site/" version))
+         (go (string-append output "/lib/guile/" version "/site-ccache")))
+    (values scm go)))
+
+(define (file-sans-extension file)      ;TODO: factorize
   "Return the substring of FILE without its extension, if any."
   (let ((dot (string-rindex file #\.)))
     (if dot