[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin eb92dfc 293/439: Fix repo links for :core packages
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin eb92dfc 293/439: Fix repo links for :core packages |
Date: |
Sun, 17 Oct 2021 15:48:22 -0400 (EDT) |
branch: elpa-admin
commit eb92dfc76a92ab93af77a1f3e292e14c5413707c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Fix repo links for :core packages
* GNUmakefile: Circumvent command-line length limit.
* admin/archive-contents.el (archive--insert-repolinks): Fix handling
of :core packages.
---
GNUmakefile | 5 ++++-
admin/archive-contents.el | 30 +++++++++++++++++++++---------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 037fbb6..9797306 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -105,7 +105,10 @@ pkgs := $(foreach pkg, $(wildcard packages/*), \
$(if $(shell [ -d "$(pkg)" ] && echo true), $(pkg)))
define SET-diff
-$(shell echo "$(1)" "$(2)" "$(2)" | tr ' ' '\n' | sort | uniq -u)
+$(shell $(file > .tmp.setdiff, $(1)) \
+ $(file >> .tmp.setdiff, $(2)) \
+ $(file >> .tmp.setdiff, $(2)) \
+ tr ' ' '\n' < .tmp.setdiff | sort | uniq -u ; rm .tmp.setdiff)
endef
define FILTER-nonsrc
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 9952469..240b7a7 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -1,6 +1,6 @@
;;; archive-contents.el --- Auto-generate an Emacs Lisp package archive. -*-
lexical-binding:t -*-
-;; Copyright (C) 2011-2017 Free Software Foundation, Inc
+;; Copyright (C) 2011-2018 Free Software Foundation, Inc
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
@@ -459,19 +459,31 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(setq url nil)))
(let* ((externals (archive--read-externals-list
(expand-file-name "../../../elpa" srcdir)))
- (external (eq :external (nth 1 (assoc name externals))))
+ (extern-desc (assoc name externals))
+ (external (eq :external (nth 1 extern-desc)))
(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/"))))
+ (urls
+ (if (eq (nth 1 extern-desc) :core)
+ (let ((files (nthcdr 2 extern-desc))
+ (file (if (cdr files)
+ (file-name-directory
+ (try-completion "" (nthcdr 3 extern-desc)))
+ (car files))))
+ (mapcar (lambda (s) (concat s file))
+ '("cgit/emacs.git/tree/"
+ "gitweb/?p=emacs.git;a=tree;f=")))
+ (mapcar (lambda (s) (concat s name))
+ (if (eq (nth 1 extern-desc) :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 "<dt>Browse %srepository</dt> <dd>" (if url
"ELPA's " ""))
"<a href=%S>%s</a> or <a href=%S>%s</a></dd>\n")
- (concat git-sv (nth 0 urls) name)
+ (concat git-sv (nth 0 urls))
'CGit
- (concat git-sv (nth 1 urls) name)
+ (concat git-sv (nth 1 urls))
'Gitweb))))
(defun archive--html-make-pkg (pkg files)
- [nongnu] elpa-admin 9db3516 274/439: Merge branch 'scratch/org-edna', (continued)
- [nongnu] elpa-admin 9db3516 274/439: Merge branch 'scratch/org-edna', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0f843a7 275/439: Merge branch 'scratch/dired-du', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 94286b7 276/439: * packages/yasnippet: Merge version 0.12.0 from upstream., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 602f32e 277/439: Merge yasnippet 0.12.1 from upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5ac89c8 281/439: * packages/yasnippet: Merge version 0.12.2 from upstream., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d5be3dd 283/439: * README: mention make check_copyrights, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d220792 286/439: Add 'packages/mmm-mode/' from commit '00c10a69c8c90178530219730ccea14ab634a74e', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8c08096 285/439: * GNUmakefile (org-fetch): Don't stop the whole update if it fails., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d276c3d 288/439: * README: Don't clone a clone., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5dc3bcb 289/439: Use "git worktree list" in archive-contents.el, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin eb92dfc 293/439: Fix repo links for :core packages,
Philip Kaludercic <=
- [nongnu] elpa-admin dbd4e0b 295/439: Merge remote-tracking branch 'refs/remotes/origin/master', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d58576c 301/439: * GNUmakefile (FILTER-nonsrc): Don't compile .dir-locals.el files., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0e7eab5 304/439: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 21c69f7 308/439: Merge commit 'c304ac9a80ab7e96f705771a3842a48bf5a32c8a', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 75bab1c 309/439: * admin/archive-contents.el: Fix case of non-versions dependencies, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 26a2da8 312/439: More specific externals example., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cdefe40 311/439: Improve copying of :core files; update .gitignore, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 86e31b7 313/439: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin adf3b7f 316/439: Neater HTML table of old package versions (bug#35331), Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 55ff372 317/439: * admin/archive-contents.el: Improve package HTML headers, Philip Kaludercic, 2021/10/17