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

[GNU bug Tracking System]

Your message dated Wed, 15 Nov 2023 18:19:12 +0100
with message-id <87msvf7x4f.fsf@gnu.org>
and subject line Re: [bug#66815] [PATCH] build-system/guile: Add 
target-guile-scm+go procedure.
has caused the debbugs.gnu.org bug report #66815,
regarding [PATCH] build-system/guile: Add target-guile-scm+go procedure.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
66815: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66815
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] build-system/guile: Add target-guile-scm+go procedure.
>
>
>
>
> Date: 
>
> Sun, 29 Oct 2023 13:56:13 +0100
>
>
>
>
> 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(-)
>
> 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
>
> base-commit: ac01fef9ff3efb48e60e80930743888b0e79be66
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#66815] [PATCH] build-system/guile: Add target-guile-scm+go procedure.
>
>
>
>
> Date: 
>
> Wed, 15 Nov 2023 18:19:12 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13)
>
>
>
>
> 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’.
>
>
> --- End Message ---