[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 01/01: * README: Update for new "Version: 0" convention. * admin/
From: |
Stefan Monnier |
Subject: |
[elpa] 01/01: * README: Update for new "Version: 0" convention. * admin/forward-diffs.py: Adapt to different syntax. * admin/archive-contents.el (archive--strip-rcs-id): Remove. (batch-make-archive): Accept "Version: 0" to mean "don't publish". (archive--metadata): Don't use archive--strip-rcs-id any more. (archive--html-make-pkg): Handle the case where the is no `latest'. (batch-html-make-index): Include unreleased packages. |
Date: |
Fri, 23 May 2014 15:00:36 +0000 |
monnier pushed a commit to branch master
in repository elpa.
commit e3826c87adb74a98da3ae7922cad6c529d1177d7
Author: Stefan Monnier <address@hidden>
Date: Fri May 23 10:55:56 2014 -0400
* README: Update for new "Version: 0" convention.
* admin/forward-diffs.py: Adapt to different syntax.
* admin/archive-contents.el (archive--strip-rcs-id): Remove.
(batch-make-archive): Accept "Version: 0" to mean "don't publish".
(archive--metadata): Don't use archive--strip-rcs-id any more.
(archive--html-make-pkg): Handle the case where the is no `latest'.
(batch-html-make-index): Include unreleased packages.
---
README | 4 +-
admin/archive-contents.el | 70 +++++++++++++++++++++++++++------------------
admin/forward-diffs.py | 10 +++++-
3 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/README b/README
index 33e40fc..acc42e4 100644
--- a/README
+++ b/README
@@ -102,8 +102,8 @@ with the command:
If you want to develop a package publicly prior to its first release (to
benefit from others' feedback, primarily), but not in an external repo,
you have 2 choices:
-- you can simply put "Version: -1" to indicate that this should not be
- released.
+- you can simply put "Version: 0" to indicate that this should not be
+ released yet.
- or you can push to an "ephemeral" branch -- subject to rebase and eventual
removal upon finishing merge -- for the duration of the incubation.
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 2eead98..5f056ba 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -44,18 +44,6 @@
(list (car elt)
(archive--version-to-list (car (cdr elt)))))
-(defun archive--strip-rcs-id (str)
- "Strip RCS version ID from the version string STR.
-If the result looks like a dotted numeric version, return it.
-Otherwise return nil."
- (when str
- (when (string-match "\\`[ \t]*[$]Revision:[ \t]+" str)
- (setq str (substring str (match-end 0))))
- (condition-case nil
- (if (archive--version-to-list str)
- str)
- (error str))))
-
(defun archive--delete-elc-files (dir &optional only-orphans)
"Recursively delete all .elc files in DIR.
Delete backup files also."
@@ -85,7 +73,9 @@ Delete backup files also."
;; (nth 1 metadata) is nil for "org" which is the only package
;; still using the "org-pkg.el file to specify the metadata.
(if (and (nth 1 metadata)
- (< (string-to-number (nth 1 metadata)) 0))
+ (or (equal (nth 1 metadata) "0")
+ ;; Old deprecated convention.
+ (< (string-to-number (nth 1 metadata)) 0)))
(progn ;; Negative version: don't publish this package yet!
(message "Package %s not released yet!" dir)
(delete-directory dir 'recursive))
@@ -186,11 +176,13 @@ PKG is the name of the package and DIR is the directory
where it is."
(error "Can't parse first line of %s" mainfile)
;; Grab the other fields, which are not mandatory.
(let* ((description (match-string 1))
+ (pv )
(version
- (or (archive--strip-rcs-id (lm-header "package-version"))
- (archive--strip-rcs-id (lm-header "version"))
+ (or (lm-header "package-version")
+ (lm-header "version")
(unless (equal pkg "org")
(error "Missing `version' header"))))
+ (_ (archive--version-to-list version)) ; Sanity check!
(requires-str (lm-header "package-requires"))
(pt (lm-header "package-type"))
(simple (if pt (equal pt "simple") (= (length files) 1)))
@@ -403,6 +395,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
((file-readable-p mainsrcfile)
(with-temp-buffer
(insert-file-contents mainsrcfile)
+ (emacs-lisp-mode) ;lm-section-start needs the outline-mode setting.
(let ((start (lm-section-start hsection)))
(when start
(insert
@@ -459,17 +452,24 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(with-temp-buffer
(insert (archive--html-header (format "GNU ELPA - %s" name)))
(insert (format "<p>Description: %s</p>\n" (archive--quote desc)))
- (let* ((file (cdr (assoc latest files)))
- (attrs (file-attributes file)))
- (insert (format "<p>Latest: <a href=%S>%s</a>, %s, %s</p>\n"
- file (archive--quote file)
- (format-time-string "%Y-%b-%d" (nth 5 attrs))
- (archive--html-bytes-format (nth 7 attrs)))))
+ (if (zerop (length latest))
+ (insert "<p>This package "
+ (if files "is not in GNU ELPA any more"
+ "has not been released yet")
+ ".</p>\n")
+ (let* ((file (cdr (assoc latest files)))
+ (attrs (file-attributes file)))
+ (insert (format "<p>Latest: <a href=%S>%s</a>, %s, %s</p>\n"
+ file (archive--quote file)
+ (format-time-string "%Y-%b-%d" (nth 5 attrs))
+ (archive--html-bytes-format (nth 7 attrs))))))
(let ((maint (archive--get-prop "Maintainer" name srcdir mainsrcfile)))
(when maint
(insert (format "<p>Maintainer: %s</p>\n" (archive--quote maint)))))
- (archive--insert-repolinks name srcdir mainsrcfile
- (cdr (assoc :url (aref (cdr pkg) 4))))
+ (archive--insert-repolinks
+ name srcdir mainsrcfile
+ (or (cdr (assoc :url (aref (cdr pkg) 4)))
+ (archive--get-prop "URL" name srcdir mainsrcfile)))
(let ((rm (archive--get-section
"Commentary" '("README" "README.rst"
;; Most README.md files seem to be currently
@@ -481,7 +481,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(write-region rm nil (concat name "-readme.txt"))
(insert "<h2>Full description</h2><pre>\n" (archive--quote rm)
"\n</pre>\n")))
- (unless (< (length files) 2)
+ (unless (< (length files) (if (zerop (length latest)) 1 2))
(insert (format "<h2>Old versions</h2><table cellpadding=\"3\"
border=\"1\">\n"))
(dolist (file files)
(unless (equal (pop file) latest)
@@ -520,6 +520,10 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(goto-char (point-min))
;; Skip the first element which is a version number.
(cdr (read (current-buffer))))))
+ (dolist (subdir (directory-files "../../build/packages" nil))
+ (cond
+ ((member subdir '("." ".." "elpa.rss" "index.html" "archive-contents")))
+ (t (puthash subdir nil packages))))
(dolist (file (directory-files default-directory nil))
(cond
((member file '("." ".." "elpa.rss" "index.html" "archive-contents")))
@@ -532,10 +536,20 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(version (match-string 1 file)))
(push (cons version file) (gethash name packages))))
(t (message "Unknown file %S" file))))
- (dolist (pkg archive-contents)
- (archive--html-make-pkg pkg (gethash (symbol-name (car pkg)) packages)))
- ;; FIXME: Add (old?) packages that are in `packages' but not in
- ;; archive-contents.
+ (maphash (lambda (pkg-name files)
+ (archive--html-make-pkg
+ (let ((pkg (intern pkg-name)))
+ (or (assq pkg archive-contents)
+ ;; Add entries for packages that are either not yet
+ ;; released or not released any more.
+ ;; FIXME: Get actual description!
+ (let ((entry (cons pkg (vector nil nil "" nil nil))))
+ (setq archive-contents
+ ;; Add entry at the end.
+ (nconc archive-contents (list entry)))
+ entry)))
+ files))
+ packages)
(archive--html-make-index archive-contents)))
;;; Maintain external packages.
diff --git a/admin/forward-diffs.py b/admin/forward-diffs.py
index b073ed2..c0c330d 100755
--- a/admin/forward-diffs.py
+++ b/admin/forward-diffs.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
### forward-diffs.py --- forward emacs-diffs mails to maintainers
-## Copyright (C) 2012-2013 Free Software Foundation, Inc.
+## Copyright (C) 2012-2014 Free Software Foundation, Inc.
## Author: Glenn Morris <address@hidden>
## Maintainer: address@hidden
@@ -295,9 +295,15 @@ for line in text.splitlines():
# Summary of changes:
# packages/vlf/vlf.el | 2 +-
# 1 files changed, 1 insertions(+), 1 deletions(-)
+ #
+ # or things that look like (Git):
+ #
+ # ---
+ # packages/vlf/vlf.el | 2 +-
+ # 1 files changed, 1 insertions(+), 1 deletions(-)
#BZR: if re.match( 'modified:$', line ):
- if re.match( 'Summary of changes:$', line ):
+ if re.match( '---|Summary of changes:$', line ):
start = True
continue
- [elpa] branch master updated (995856a -> e3826c8), Stefan Monnier, 2014/05/23
- [elpa] 01/01: * README: Update for new "Version: 0" convention. * admin/forward-diffs.py: Adapt to different syntax. * admin/archive-contents.el (archive--strip-rcs-id): Remove. (batch-make-archive): Accept "Version: 0" to mean "don't publish". (archive--metadata): Don't use archive--strip-rcs-id any more. (archive--html-make-pkg): Handle the case where the is no `latest'. (batch-html-make-index): Include unreleased packages.,
Stefan Monnier <=