From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <87wp8rq57k.fsf@gmail.com> References: <87h8zwptdn.fsf@gmail.com> <874lvwp7km.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:41964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHV8f-0004Cm-3t for bug-guix@gnu.org; Sun, 04 Jun 2017 09:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHV8V-0006e4-Lo for bug-guix@gnu.org; Sun, 04 Jun 2017 09:00:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHV8V-0006dh-Gg for bug-guix@gnu.org; Sun, 04 Jun 2017 09:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dHV8V-0003kG-6U for bug-guix@gnu.org; Sun, 04 Jun 2017 09:00:03 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <874lvwp7km.fsf@gmail.com> (Maxim Cournoyer's message of "Sat, 03 Jun 2017 23:53:29 -0700") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Maxim Cournoyer Cc: 27222@debbugs.gnu.org I Cc-ed Arun, the author of the mentioned change (commit d879685176d23c111f4fc665698251b25cdf9124). [...] > From a035d07dfa6cbddccfa0476e2009d19bdf296941 Mon Sep 17 00:00:00 2001 > From: Maxim Cournoyer > 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