all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Alex Kost <alezost@gmail.com>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Cc: 27222@debbugs.gnu.org
Subject: bug#27222: [PATCH] emacs-build-system install phase doesn't honor directory hierarchy
Date: Sun, 04 Jun 2017 15:59:11 +0300	[thread overview]
Message-ID: <87wp8rq57k.fsf@gmail.com> (raw)
In-Reply-To: <874lvwp7km.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 03 Jun 2017 23:53:29 -0700")

I Cc-ed Arun, the author of the mentioned change (commit
d879685176d23c111f4fc665698251b25cdf9124).

[...]
> From a035d07dfa6cbddccfa0476e2009d19bdf296941 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
> Date: Sat, 3 Jun 2017 23:43:02 -0700
> Subject: [PATCH] build-system: emacs: Install elisp files from subdirectories
>
> * guix/build/emacs-build-system.scm (install)[include]: Get rid of default
> value.
> [exclude]: Likewise.
> * guix/build/emacs-build-system.scm (emacs-build)[include]: Modify default
> regexp value so that elisp files get matched (and installed) for any directory
> depth level.
> ---
>  guix/build-system/emacs.scm       | 2 +-
>  guix/build/emacs-build-system.scm | 5 +----
>  2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm
> index 9a46ecfd2..a97fcedc3 100644
> --- a/guix/build-system/emacs.scm
> +++ b/guix/build-system/emacs.scm
> @@ -83,7 +83,7 @@
>                        (phases '(@ (guix build emacs-build-system)
>                                    %standard-phases))
>                        (outputs '("out"))
> -                      (include ''("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
> +                      (include ''("\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))

As far as I understand it, it was done for purpose: some packages
include "uninteresting" (for tests, maintenance, etc.) *.el files in
subdirs, that's why they are excluded by default.  So probably a better
solution would be to fix 'ert-runner' package (as it is done in commit
b1d32ec0e23bfec1dab4c56909228a494b2b0d60, for example).  WDYT?

>                        (exclude ''("^\\.dir-locals\\.el$" "-pkg\\.el$" "^[^/]*tests?\\.el$"))
>                        (search-paths '())
>                        (system (%current-system))
> diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
> index 50af4be36..1373cb6f7 100644
> --- a/guix/build/emacs-build-system.scm
> +++ b/guix/build/emacs-build-system.scm
> @@ -95,10 +95,7 @@ store in '.el' files."
>            (substitute-cmd))))
>      #t))
>  
> -(define* (install #:key outputs
> -                  (include '("^[^/]*\\.el$" "^[^/]*\\.info$" "^doc/.*\\.info$"))
> -                  (exclude '("^\\.dir-locals\\.el$" "-pkg\\.el$" "^[^/]*tests?\\.el$"))
> -                  #:allow-other-keys)
> +(define* (install #:key outputs include exclude #:allow-other-keys)
>    "Install the package contents."

I also think these arguments are redundant!  I suggested to remove this
duplication at:

  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26559#41

-- 
Alex

  reply	other threads:[~2017-06-04 13:00 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-03 23:02 bug#27222: emacs-build-system install phase doesn't honor directory hierarchy Maxim Cournoyer
2017-06-04  6:53 ` bug#27222: [PATCH] " Maxim Cournoyer
2017-06-04 12:59   ` Alex Kost [this message]
2017-06-04 16:44     ` Maxim Cournoyer
2017-06-04 19:41       ` Alex Kost
2017-06-04 19:25     ` Arun Isaac
2017-06-05  5:07       ` Maxim Cournoyer
2017-06-05 10:03         ` Arun Isaac
     [not found]         ` <73a30871.AEQALMWm9gcAAAAAAAAAAAPHPfsAAAACwQwAAAAAAAW9WABZNSx9@mailjet.com>
2017-06-05 14:54           ` Maxim Cournoyer
     [not found]         ` <a444cf1b.AEQALMWm9gYAAAAAAAAAAAO2CsUAAAACwQwAAAAAAAW9WABZNSx9@mailjet.com>
2017-06-05 20:13           ` Alex Kost
2017-06-08 14:31             ` Arun Isaac
     [not found]             ` <ad8c9523.AEUALD4wqa8AAAAAAAAAAAPHPfsAAAACwQwAAAAAAAW9WABZOV_H@mailjet.com>
2017-06-08 14:58               ` Maxim Cournoyer
     [not found]     ` <0efe58d4.AEUAK47aAUsAAAAAAAAAAAO2CsUAAAACwQwAAAAAAAW9WABZNF6l@mailjet.com>
2017-06-05 20:07       ` Alex Kost
2017-06-06 17:44         ` Arun Isaac
2017-06-06 16:35 ` bug#27222: [PATCH] Fix ert-runner regression (was: emacs-build-system install phase doesn't honor directory hierarchy) Maxim Cournoyer
2017-06-06 23:02   ` bug#27222: [PATCH] Fix ert-runner regression Ludovic Courtès
2017-06-07 10:28     ` Arun Isaac
2017-06-07 20:11       ` Alex Kost

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=87wp8rq57k.fsf@gmail.com \
    --to=alezost@gmail.com \
    --cc=27222@debbugs.gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    /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.