[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 2ebff0e 093/357: Use README.{rst,md,org}; Auto-generat
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 2ebff0e 093/357: Use README.{rst,md,org}; Auto-generate foo-pkg.el. |
Date: |
Thu, 10 Dec 2020 18:06:22 -0500 (EST) |
branch: elpa-admin
commit 2ebff0e724d4a3678b93b3aa389b120148eec69b
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Use README.{rst,md,org}; Auto-generate foo-pkg.el.
---
admin/archive-contents.el | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index fcc7071..072d03f 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -76,9 +76,10 @@ Delete backup files also."
(archive--delete-elc-files dir)
;; Test whether this is a simple or multi-file package.
(setq simple-p (archive--simple-package-p dir pkg))
- (push (if simple-p
+ (push (if (car simple-p)
(apply #'archive--process-simple-package
- dir pkg simple-p)
+ dir pkg (cdr simple-p))
+ (apply 'archive--write-pkg-file dir pkg (cdr simple-p))
(archive--process-multi-file-package dir pkg))
packages)))
(error (error "Error in %s: %S" dir v))))
@@ -147,24 +148,20 @@ Currently only refreshes the ChangeLog files."
(defun archive--simple-package-p (dir pkg)
"Test whether DIR contains a simple package named PKG.
-If so, return a list (VERSION DESCRIPTION REQ), where
-VERSION is the version string of the simple package, DESCRIPTION
-is the brief description of the package, REQ is a list of
-requirements.
+Return a list (SIMPLE VERSION DESCRIPTION REQ), where
+SIMPLE is non-nil if the package is indeed simple;
+VERSION is the version string of the simple package;
+DESCRIPTION is the brief description of the package;
+REQ is a list of requirements.
Otherwise, return nil."
(let* ((pkg-file (expand-file-name (concat pkg "-pkg.el") dir))
(mainfile (expand-file-name (concat pkg ".el") dir))
- (files (directory-files dir nil archive-re-no-dot))
+ (files (directory-files dir nil "\\.el\\'"))
version description req)
- (dolist (file (prog1 files (setq files ())))
- (unless (string-match "\\(?:\\.elc\\|~\\)\\'" file)
- (push file files)))
(setq files (delete (concat pkg "-pkg.el") files))
(setq files (delete (concat pkg "-autoloads.el") files))
- (setq files (delete "ChangeLog" files))
(cond
- ((and (or (not (file-exists-p pkg-file))
- (= (length files) 1))
+ ((and (not (file-exists-p pkg-file))
(file-exists-p mainfile))
(with-temp-buffer
(insert-file-contents mainfile)
@@ -181,7 +178,7 @@ Otherwise, return nil."
(if requires-str
(setq req (mapcar 'archive--convert-require
(car (read-from-string requires-str))))))
- (list version description req))))
+ (list (= (length files) 1) version description req))))
((not (file-exists-p pkg-file))
(error "Can find single file nor package desc file in %s" dir)))))
@@ -266,7 +263,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(if simple-p
(progn
;; (message "Refreshing pkg description of %s" pkg)
- (apply 'archive--write-pkg-file dir pkg simple-p))
+ (apply 'archive--write-pkg-file dir pkg (cdr simple-p)))
;; (message "Not refreshing pkg description of %s" pkg)
)))
@@ -336,6 +333,13 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(lm-header prop))))))
(defun archive--get-section (hsection fsection srcdir mainsrcfile)
+ (when (consp fsection)
+ (while (cdr-safe fsection)
+ (setq fsection
+ (if (file-readable-p (expand-file-name (car fsection) srcdir))
+ (car fsection)
+ (cdr fsection))))
+ (when (consp fsection) (setq fsection (car fsection))))
(cond
((file-readable-p (expand-file-name fsection srcdir))
(with-temp-buffer
@@ -409,7 +413,10 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(when maint
(insert (format "<p>Maintainer: %s</p>\n" (archive--quote maint)))))
(archive--insert-repolinks name srcdir mainsrcfile)
- (let ((readme (archive--get-section "Commentary" "README" srcdir
mainsrcfile)))
+ (let ((readme (archive--get-section "Commentary"
+ '("README" "README.rst" "README.md"
+ "README.org")
+ srcdir mainsrcfile)))
(when readme
(write-region readme nil (concat name "-readme.txt"))
(insert "<h2>Full description</h2><pre>\n" (archive--quote readme)
@@ -471,7 +478,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
;;; Maintain external packages.
-(defconst archive--elpa-git-url "git+ssh://git.sv.gnu.org/srv/git/emacs/elpa")
+(defconst archive--elpa-git-url "git://git.sv.gnu.org/emacs/elpa")
(defun archive-add/remove/update-externals ()
(let ((exts (with-current-buffer (find-file-noselect "externals-list")
- [elpa] elpa-admin 303f2c9 075/357: * admin/archive-contents.el (batch-make-site-package): New function., (continued)
- [elpa] elpa-admin 303f2c9 075/357: * admin/archive-contents.el (batch-make-site-package): New function., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin dfa5808 053/357: Rework archive-contents.el to handle new packages/ structure., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 6c94727 068/357: archive-contents.el (archive--simple-package-p): Fix prop-line matching., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin da7456c 065/357: write README in markdown, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 49fce77 070/357: Rename README to README.rst, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cbd75c6 082/357: README.md, load-relative.el: Go over documentation. Makefile.am: add targets test and test-short, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c497b5b 083/357: * GNUmakefile: Rename from Makefile. Add targets for in-place use., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 42c5112 084/357: * GNUmakefile (%.elc): Don't depend on $(autoloads) since that causes, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 480283a 089/357: Move check_copyright to the makefile, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin bffc4a6 090/357: Don't create local branches, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 2ebff0e 093/357: Use README.{rst,md,org}; Auto-generate foo-pkg.el.,
Stefan Monnier <=
- [elpa] elpa-admin 55c3f5d 100/357: Add YAsnippet metadata., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 21e1b0e 101/357: Sync with yasnippet/master, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4f4a301 104/357: * GNUmakefile: Obey a .elpaignore file in a package's root directory., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0ed260a 107/357: add :keywords to extra package properties, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 52e4af0 105/357: Add new element to the archive-contents vector, and put, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9f93862 109/357: seems to be generally usable, added a README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8d5c048 169/357: Merge commit 'c876c3c62f03d7e945b049932a55496b3cdfe05d', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 134842c 174/357: Merge commit '0e1d1440e4819d76cc68b213431722884af66e89', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 401790d 168/357: Add 'packages/load-relative/' from commit '064074d7dcc8d26d59ab9ceb099b43e6870c58d1', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0366a3f 162/357: Add packages/darkroom by merging its upstream subtree, Stefan Monnier, 2020/12/10