[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#27222: [PATCH] emacs-build-system install phase doesn't honor direct
From: |
Alex Kost |
Subject: |
bug#27222: [PATCH] emacs-build-system install phase doesn't honor directory hierarchy |
Date: |
Sun, 04 Jun 2017 15:59:11 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) |
I Cc-ed Arun, the author of the mentioned change (commit
d879685176d23c111f4fc665698251b25cdf9124).
[...]
> From a035d07dfa6cbddccfa0476e2009d19bdf296941 Mon Sep 17 00:00:00 2001
> From: Maxim Cournoyer <address@hidden>
> 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