all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Bruno Victal <mirai@makinata.eu>, 66500@debbugs.gnu.org
Subject: [bug#66500] [PATCH core-updates 1/3] build: copy-build-system: Allow specifying different output labels.
Date: Thu, 19 Oct 2023 11:46:07 +0200	[thread overview]
Message-ID: <c86eeee9162d8a2a693fb552dac6df93f9d228cf.camel@gmail.com> (raw)
In-Reply-To: <b486734d4ac6f5247d216da3444d91acb7e2ebd1.1697124046.git.mirai@makinata.eu>

Hi Bruno,

Am Donnerstag, dem 12.10.2023 um 16:30 +0100 schrieb Bruno Victal:
> [...]
> +@item When a package has multiple outputs the @code{#:output}
> argument
> +can be used to specify which output label the files should be
> installed
> +to.
This is perhaps extremely nitpicky, but there should be a comma before
"the @code{#:output} argument".

> @@ -63,6 +64,9 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
>        If both `#:include*` and `#:exclude*` are specified, the
> exclusion is done
>        on the inclusion list.
>  
> +- When a package has multiple outputs the `#:output` argument can be
> used
> +to specify which output label the files should be installed to.
> +
Same here.
>  Examples:
>  
>  - `(\"foo/bar\" \"share/my-app/\")`: Install bar to \"share/my-
> app/bar\".
> @@ -72,7 +76,9 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
>  - `(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))`: Install
> only \"foo/sub/file\" to
>  \"share/my-app/sub/file\".
>  - `(\"foo/sub\" \"share/my-app\" #:include (\"file\"))`: Install
> \"foo/sub/file\" to
> -\"share/my-app/file\"."
> +\"share/my-app/file\".
> +- `(\"foo/doc\" \"share/my-app/doc\" #:output \"doc\")`: Install
> \"foo/doc\" to
> +\"share/my-app/doc\" for output labelled \"doc\"."
s/for output labelled/within the output named/
or 
s/for output labelled \"doc\"/within the \"doc\" output/

>    (define (install-simple source target)
>      "Install SOURCE to TARGET.
>  TARGET must point to a store location.
> @@ -133,8 +139,10 @@ (define* (install #:key install-plan outputs
> #:allow-other-keys)
>                                        (string-append target "/")))
>               file-list))))
>  
> -  (define* (install source target #:key include exclude include-
> regexp exclude-regexp)
> -    (let ((final-target (string-append (assoc-ref outputs "out") "/"
> target))
> +  (define* (install source target
> +                    #:key include exclude include-regexp exclude-
> regexp
> +                    (output "out"))
> +    (let ((final-target (string-append (assoc-ref outputs output)
> "/" target))
>            (filters? (or include exclude include-regexp exclude-
> regexp)))
>        (when (and (not (file-is-directory? source))
>                   filters?)
Otherwise LGTM.  Note, however, that CI doesn't like this series.

Cheers




  reply	other threads:[~2023-10-19  9:47 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-12 15:27 [bug#66500] [PATCH core-updates 0/3] Custom output labels for copy-build-system Bruno Victal
2023-10-12 15:30 ` [bug#66500] [PATCH core-updates 1/3] build: copy-build-system: Allow specifying different output labels Bruno Victal
2023-10-19  9:46   ` Liliana Marie Prikler [this message]
2023-10-19 15:36     ` Bruno Victal
2023-10-12 15:30 ` [bug#66500] [PATCH core-updates 2/3] gnu: docbook-dsssl: Refactor install-plan Bruno Victal
2023-10-19  9:47   ` Liliana Marie Prikler
2023-10-19 15:25     ` Bruno Victal
2023-10-12 15:30 ` [bug#66500] [PATCH core-updates 3/3] gnu: docbook-dsssl: Fix script installation path Bruno Victal
2023-10-19 15:37 ` [bug#66500] [PATCH core-updates v2 0/3] Custom output labels for copy-build-system Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 1/3] build: copy-build-system: Allow specifying different output labels Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 2/3] gnu: docbook-dsssl: Refactor install-plan Bruno Victal
2023-10-19 15:38   ` [bug#66500] [PATCH core-updates v2 3/3] gnu: docbook-dsssl: Fix script installation path Bruno Victal
2023-12-20 21:10   ` bug#66500: [PATCH core-updates v2 0/3] Custom output labels for copy-build-system Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c86eeee9162d8a2a693fb552dac6df93f9d228cf.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=66500@debbugs.gnu.org \
    --cc=mirai@makinata.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.