From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Leake Newsgroups: gmane.emacs.devel Subject: Re: include Ada Reference Manual info files in ada-mode ELPA package? Date: Sat, 27 Sep 2014 23:12:03 -0500 Message-ID: <85lhp4gz8s.fsf@stephe-leake.org> References: <85zjdqhys4.fsf@stephe-leake.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1411877568 12589 80.91.229.3 (28 Sep 2014 04:12:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 28 Sep 2014 04:12:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 28 06:12:41 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XY5qj-0001Qo-5K for ged-emacs-devel@m.gmane.org; Sun, 28 Sep 2014 06:12:41 +0200 Original-Received: from localhost ([::1]:58361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XY5qi-0001jI-K1 for ged-emacs-devel@m.gmane.org; Sun, 28 Sep 2014 00:12:40 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XY5qR-0001jC-D3 for emacs-devel@gnu.org; Sun, 28 Sep 2014 00:12:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XY5qK-0006ou-UE for emacs-devel@gnu.org; Sun, 28 Sep 2014 00:12:23 -0400 Original-Received: from dnvrco-outbound-snat.email.rr.com ([107.14.73.225]:17891 helo=dnvrco-oedge-vip.email.rr.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XY5qK-0006oP-OL for emacs-devel@gnu.org; Sun, 28 Sep 2014 00:12:16 -0400 Original-Received: from [70.94.38.149] ([70.94.38.149:54674] helo=TAKVER) by dnvrco-oedge01 (envelope-from ) (ecelerity 3.5.0.35861 r(Momo-dev:tip)) with ESMTP id 73/EB-23176-79A87245; Sun, 28 Sep 2014 04:12:08 +0000 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (windows-nt) X-RR-Connecting-IP: 107.14.64.118:25 X-Authority-Analysis: v=2.1 cv=d8V7yHTE c=1 sm=1 tr=0 a=AppmJ/7ZOOFWL/q6u6u93g==:117 a=AppmJ/7ZOOFWL/q6u6u93g==:17 a=ayC55rCoAAAA:8 a=9XSUBuVRJI8A:10 a=o_R75loqY_IA:10 a=9i_RQKNPAAAA:8 a=LUB8QZPLN626Dbc-LDsA:9 a=FMD1XRJ_Ct4A:10 X-Cloudmark-Score: 0 X-detected-operating-system: by eggs.gnu.org: BaiduSpider X-Received-From: 107.14.73.225 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:174756 Archived-At: Stephen Leake writes: > Perhaps making the ARM a separate ELPA package would be the right > choice. It would be an info-only package, so there would be no .el file > to hold the meta-data header. I guess I'd have to add one just for that. > Would that be ok? I tried this. It fails because `archive--metadata' in elpa/admin/archive-contents.el thinks it's a simple (one-file) package, because there is only one .el file. A simple fix is to also include 'dir' in that check. Here's a patch against ELPA head (also fixes a small typo in an error message): --- a/admin/archive-contents.el +++ b/admin/archive-contents.el @@ -167,7 +167,7 @@ EXTRAS is an alist with additional metadata. PKG is the name of the package and DIR is the directory where it is." (let* ((mainfile (expand-file-name (concat pkg ".el") dir)) - (files (directory-files dir nil "\\.el\\'"))) + (files (directory-files dir nil "^dir$\\|\\.el\\'"))) (setq files (delete (concat pkg "-pkg.el") files)) (setq files (delete (concat pkg "-autoloads.el") files)) (cond @@ -201,7 +201,7 @@ PKG is the name of the package and DIR is the directory where it is." (list (cons :url url) (cons :keywords keywords))))))) (t - (error "Can find main file %s file in %s" mainfile dir))))) + (error "Can't find main file %s file in %s" mainfile dir))))) (defun archive--process-simple-package (dir pkg vers desc req extras) "Deploy the contents of DIR into the archive as a simple package. With that fix, the ada-ref-man package installs, and the info files show up nicely. Ok to install the patch in ELPA? -- -- Stephe