[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin d54db67 139/439: * admin/archive-contents.el: Keep b
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin d54db67 139/439: * admin/archive-contents.el: Keep both home page a repository links. |
Date: |
Sun, 17 Oct 2021 15:47:48 -0400 (EDT) |
branch: elpa-admin
commit d54db673728fde72d25c4bb92ed7ab229ed8ad78
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el: Keep both home page a repository links.
---
admin/archive-contents.el | 51 ++++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 23 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 241f1ad..96ecb76 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -161,6 +161,9 @@ Currently only refreshes the ChangeLog files."
dir (expand-file-name "packages/" srcdir)))))
))
+(defconst archive-default-url-format "http://elpa.gnu.org/packages/%s.html")
+(defconst archive-default-url-re (format archive-default-url-format ".*"))
+
(defun archive--metadata (dir pkg)
"Return a list (SIMPLE VERSION DESCRIPTION REQ EXTRAS),
where SIMPLE is non-nil if the package is simple;
@@ -193,7 +196,7 @@ PKG is the name of the package and DIR is the directory
where it is."
(simple (if pt (equal pt "simple") (= (length files) 1)))
(keywords (lm-keywords-list))
(url (or (lm-header "url")
- (format "http://elpa.gnu.org/packages/%s.html" pkg)))
+ (format archive-default-url-format pkg)))
(req
(if requires-str
(mapcar 'archive--convert-require
@@ -422,28 +425,30 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(replace-regexp-in-string "&" "&" txt)))
(defun archive--insert-repolinks (name srcdir mainsrcfile url)
- (if url
- (insert (format "<p>Origin: <a href=%S>%s</a></p>\n"
- url (archive--quote url)))
- (let* ((externals
- (with-temp-buffer
- (insert-file-contents
- (expand-file-name "../../../elpa/externals-list" srcdir))
- (read (current-buffer))))
- (external (eq :external (nth 1 (assoc name externals))))
- (git-sv "http://git.savannah.gnu.org/")
- (urls (if external
- '("cgit/emacs/elpa.git/?h=externals/"
-
"gitweb/?p=emacs/elpa.git;a=shortlog;h=refs/heads/externals/")
- '("cgit/emacs/elpa.git/tree/packages/"
- "gitweb/?p=emacs/elpa.git;a=tree;f=packages/"))))
- (insert (format
- (concat "<p>Browse repository: <a href=%S>%s</a>"
- " or <a href=%S>%s</a></p>\n")
- (concat git-sv (nth 0 urls) name)
- 'CGit
- (concat git-sv (nth 1 urls) name)
- 'Gitweb)))))
+ (when url
+ (insert (format "<p>Home page: <a href=%S>%s</a></p>\n"
+ url (archive--quote url)))
+ (when (string-match archive-default-url-re url)
+ (setq url nil)))
+ (let* ((externals
+ (with-temp-buffer
+ (insert-file-contents
+ (expand-file-name "../../../elpa/externals-list" srcdir))
+ (read (current-buffer))))
+ (external (eq :external (nth 1 (assoc name externals))))
+ (git-sv "http://git.savannah.gnu.org/")
+ (urls (if external
+ '("cgit/emacs/elpa.git/?h=externals/"
+
"gitweb/?p=emacs/elpa.git;a=shortlog;h=refs/heads/externals/")
+ '("cgit/emacs/elpa.git/tree/packages/"
+ "gitweb/?p=emacs/elpa.git;a=tree;f=packages/"))))
+ (insert (format
+ (concat (format "<p>Browse %srepository: " (if url "ELPA's " ""))
+ "<a href=%S>%s</a> or <a href=%S>%s</a></p>\n")
+ (concat git-sv (nth 0 urls) name)
+ 'CGit
+ (concat git-sv (nth 1 urls) name)
+ 'Gitweb))))
(defun archive--html-make-pkg (pkg files)
(let* ((name (symbol-name (car pkg)))
- [nongnu] elpa-admin 0306c73 111/439: update README, (continued)
- [nongnu] elpa-admin 0306c73 111/439: update README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 210b02d 125/439: README and install instructions mention GNU ELPA, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 96a8283 129/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a3f667f 133/439: Don't allow package-initialize to use ~/.emacs.d, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b09c975 134/439: Change echo statements during build., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 657ebb0 140/439: Add ergoemacs-mode; fix up externals maintenance, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 60d74f2 136/439: Merge commit 'aecfbcbc10cf03ec94062ac3e590f8118e5a0434', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c7bd6b7 159/439: * GNUmakefile: Fix generation of <pkg>-pkg.el files., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin db9b5cd 155/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0366a3f 162/439: Add packages/darkroom by merging its upstream subtree, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d54db67 139/439: * admin/archive-contents.el: Keep both home page a repository links.,
Philip Kaludercic <=
- [nongnu] elpa-admin d4312f8 143/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8861b20 138/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e608fc6 160/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a25204a 142/439: [quarter-plane] Fix typo in Commentary., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin adc1e5b 146/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 3caf5e7 154/439: * GNUmakefile: Don't look for .el files under .git, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 4028a03 161/439: * GNUmakefile (%-pkg.el): Silence the emacs command line again., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8f23f86 144/439: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 3038d13 151/439: README: Use remote.origin.url to avoid loosing write access and save some typing., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 548b0ee 164/439: Remove version.texi from the repo, Philip Kaludercic, 2021/10/17