[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 4eaf276 078/439: * admin/archive-contents.el (batch-
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 4eaf276 078/439: * admin/archive-contents.el (batch-make-archive): Don't demote errors. |
Date: |
Sun, 17 Oct 2021 15:47:37 -0400 (EDT) |
branch: elpa-admin
commit 4eaf27662e0549708eafcceaba92324555226246
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el (batch-make-archive): Don't demote errors.
(batch-prepare-packages): Don't use cl-pushnew.
(archive--process-simple-package): Fix insertion of ChangeLog.
(batch-make-site-dir): Don't demote errors.
* Makefile (archive-tmp): Remove it before re-creating it.
---
admin/archive-contents.el | 76 +++++++++++++++++++++++------------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 152a56a..28a949d 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -65,7 +65,7 @@ Delete backup files also."
(dolist (dir (directory-files default-directory nil archive-re-no-dot))
(condition-case v
(if (not (file-directory-p dir))
- (error "Skipping non-package file %s" dir)
+ (message "Skipping non-package file %s" dir)
(let* ((pkg (file-name-nondirectory dir))
(autoloads-file (expand-file-name (concat pkg
"-autoloads.el") dir))
simple-p)
@@ -80,8 +80,7 @@ Delete backup files also."
dir pkg simple-p)
(archive--process-multi-file-package dir pkg))
packages)))
- ;; Error handler
- (error (message "%s" (cadr v)))))
+ (error (error "Error in %s: %S" dir v))))
(with-temp-buffer
(pp (nreverse packages) (current-buffer))
(write-region nil nil "archive-contents"))))
@@ -113,12 +112,12 @@ Currently only refreshes the ChangeLog files."
(error "Error signaled by bzr log -v -r%d.." (1+ prevno)))
(goto-char (point-min))
(while (re-search-forward "^ packages/\\([-[:alnum:]]+\\)/" nil t)
- (cl-pushnew (match-string 1) pkgs :test #'equal))))
+ (pushnew (match-string 1) pkgs :test #'equal))))
(dolist (pkg pkgs)
(condition-case v
(if (file-directory-p pkg)
(archive--make-changelog pkg))
- (error (message "%s" (cadr v)))))
+ (error (message "Error: %S" v))))
(write-region (number-to-string new-revno) nil wit nil 'quiet)))
(defun archive--simple-package-p (dir pkg)
@@ -194,11 +193,15 @@ package commentary to PKG-readme.txt. Return the
descriptor."
(re-search-backward "^;;;.*ends here")
(re-search-backward "^(provide")
(skip-chars-backward " \t\n")
- (insert "\n")
- (let ((start (point)))
+ (insert "\n\n;;;; ChangeLog:\n\n")
+ (let* ((start (point))
+ (end (copy-marker start t)))
(insert-file-contents cl)
+ (goto-char end)
(unless (bolp) (insert "\n"))
- (comment-region start (point)))
+ (while (progn (forward-line -1) (>= (point) start))
+ (insert ";; ")))
+ (set (make-local-variable 'backup-inhibited) t)
(save-buffer)
(kill-buffer)))
(delete-directory dir t)
@@ -253,36 +256,33 @@ PKG-readme.txt. Return the descriptor."
(setq package-dir (expand-file-name package-dir default-directory))
(setq site-dir (expand-file-name site-dir default-directory))
(dolist (dir (directory-files package-dir t archive-re-no-dot))
- (condition-case v
- (if (not (file-directory-p dir))
- (error "Skipping non-package file %s" dir)
- (let* ((pkg (file-name-nondirectory dir))
- (autoloads-file (expand-file-name
- (concat pkg "-autoloads.el") dir))
- simple-p version)
- ;; Omit autoloads and .elc files from the package.
- (if (file-exists-p autoloads-file)
- (delete-file autoloads-file))
- (archive--delete-elc-files dir 'only-orphans)
- ;; Test whether this is a simple or multi-file package.
- (setq simple-p (archive--simple-package-p dir pkg))
- (if simple-p
- (progn
- (apply 'archive--write-pkg-file dir pkg simple-p)
- (setq version (car simple-p)))
- (setq version
- (nth 2 (archive--multi-file-package-def dir pkg))))
- (make-symbolic-link (expand-file-name dir package-dir)
- (expand-file-name (concat pkg "-" version)
- site-dir)
- t)
- (let ((make-backup-files nil))
- (package-generate-autoloads pkg dir))
- (let ((load-path (cons dir load-path)))
- ;; FIXME: Don't compile the -pkg.el files!
- (byte-recompile-directory dir 0))))
- ;; Error handler
- (error (message "%s" (cadr v))))))
+ (if (not (file-directory-p dir))
+ (message "Skipping non-package file %s" dir)
+ (let* ((pkg (file-name-nondirectory dir))
+ (autoloads-file (expand-file-name
+ (concat pkg "-autoloads.el") dir))
+ simple-p version)
+ ;; Omit autoloads and .elc files from the package.
+ (if (file-exists-p autoloads-file)
+ (delete-file autoloads-file))
+ (archive--delete-elc-files dir 'only-orphans)
+ ;; Test whether this is a simple or multi-file package.
+ (setq simple-p (archive--simple-package-p dir pkg))
+ (if simple-p
+ (progn
+ (apply 'archive--write-pkg-file dir pkg simple-p)
+ (setq version (car simple-p)))
+ (setq version
+ (nth 2 (archive--multi-file-package-def dir pkg))))
+ (make-symbolic-link (expand-file-name dir package-dir)
+ (expand-file-name (concat pkg "-" version)
+ site-dir)
+ t)
+ (let ((make-backup-files nil))
+ (package-generate-autoloads pkg dir))
+ (let ((load-path (cons dir load-path)))
+ ;; FIXME: Don't compile the -pkg.el files!
+ (byte-recompile-directory dir 0))))))
(defun batch-make-site-package (sdir)
(let* ((dest (car (file-attributes sdir)))
- [nongnu] elpa-admin b25e1bf 039/439: Rephrase documentation and comments, (continued)
- [nongnu] elpa-admin b25e1bf 039/439: Rephrase documentation and comments, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5fefd44 048/439: Update archive-contents to add package versions from contents., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e148a06 052/439: Put quotes `...' around the example function add-word-to-dictionary, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 45792fe 051/439: Remove version numbers from filenames in packages/ dir., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5319f2f 062/439: * archive-contents.el: Make `site' more incrementally., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin becd7be 063/439: * archive-contents.el (archive--make-changelog): New fun., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6c94727 068/439: archive-contents.el (archive--simple-package-p): Fix prop-line matching., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin dc8ca2b 072/439: Note availability of Melpa packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 518362a 073/439: Merge pull request #13 from dgutov/master, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 50b05c8 074/439: Add SML-mode., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 4eaf276 078/439: * admin/archive-contents.el (batch-make-archive): Don't demote errors.,
Philip Kaludercic <=
- [nongnu] elpa-admin b7f2140 081/439: Thanks go to Lars Andersen., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 87dd559 092/439: Update infrastructure for Git., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 2ebff0e 093/439: Use README.{rst,md,org}; Auto-generate foo-pkg.el., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 55c3f5d 100/439: Add YAsnippet metadata., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 73304d8 097/439: Fix up deployment script, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c8efad2 096/439: Fix up copyrights and the checking code, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 4f4a301 104/439: * GNUmakefile: Obey a .elpaignore file in a package's root directory., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin e38e391 108/439: Use lm-keywords-list instead of split-string for archive contents., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7db4e2d 112/439: small updates to README and NOTES, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b84cae0 119/439: * archive-contents.el (archive--simple-package-p): Quote the, Philip Kaludercic, 2021/10/17