From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maxim Cournoyer Subject: bug#27222: [PATCH] emacs-build-system install phase doesn't honor directory hierarchy Date: Sat, 03 Jun 2017 23:53:29 -0700 Message-ID: <874lvwp7km.fsf@gmail.com> References: <87h8zwptdn.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHPQL-0008TS-Ct for bug-guix@gnu.org; Sun, 04 Jun 2017 02:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHPQI-0007VX-8w for bug-guix@gnu.org; Sun, 04 Jun 2017 02:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51848) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHPQI-0007VD-38 for bug-guix@gnu.org; Sun, 04 Jun 2017 02:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dHPQH-0001gL-Tb for bug-guix@gnu.org; Sun, 04 Jun 2017 02:54:01 -0400 In-Reply-To: <87h8zwptdn.fsf@gmail.com> Sender: "Debbugs-submit" Resent-Message-ID: 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: 27222@debbugs.gnu.org --=-=-= Content-Type: text/plain Hello, The previous regexp would have worked, but what got me was that the default keyword arguments values were duplicated (and I was fixing the useless version in build/emac-build-system.scm instead of the one used in build-system/emacs.scm). The attached patch fixes this particular problem (tested with ert-runner). Thanks, Maxim --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-build-system-emacs-Install-elisp-files-from-subdirec.patch >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$")) (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." (define source (getcwd)) -- 2.13.0 --=-=-=--