(pp (nreverse packages) (current-buffer))
(write-region nil nil "archive-contents"))))
-(defun batch-prepare-packages ()
+(defconst archive--revno-re "[0-9a-f]+")
+
+(defun archive-prepare-packages (srcdir)
"Prepare the `packages' directory inside the Git checkout.
Expects to be called from within the `packages' directory.
\"Prepare\" here is for subsequent construction of the packages and archive,
so it is meant to refresh any generated files we may need.
Currently only refreshes the ChangeLog files."
+ (setq srcdir (file-name-as-directory (expand-file-name srcdir)))
(let* ((wit ".changelog-witness")
- (prevno (or (with-temp-buffer
- (ignore-errors (insert-file-contents wit))
- (when (looking-at "[1-9][0-9]*\\'")
- (string-to-number (match-string 0))))
- 1))
+ (prevno (with-temp-buffer
+ (ignore-errors (insert-file-contents wit))
+ (if (looking-at (concat archive--revno-re "$"))
+ (match-string 0)
+ (error "Can't find previous revision name"))))
(new-revno
(or (with-temp-buffer
- (call-process "bzr" nil '(t) nil "revno")
- (goto-char (point-min))
- (when (looking-at "[1-9][0-9]*$")
- (string-to-number (match-string 0))))
- (error "bzr revno did not return a number as expected")))
+ (let ((default-directory srcdir))
+ (call-process "git" nil '(t) nil "rev-parse" "HEAD")
+ (goto-char (point-min))
+ (when (looking-at (concat archive--revno-re "$"))
+ (match-string 0))))
+ (error "Couldn't find the current revision's name")))
(pkgs '()))
- (unless (= prevno new-revno)
+ (unless (equal prevno new-revno)
(with-temp-buffer
- (unless (zerop (call-process "bzr" nil '(t) nil "log" "-v"
- (format "-r%d.." (1+ prevno))))
- (error "Error signaled by bzr log -v -r%d.." (1+ prevno)))
+ (let ((default-directory srcdir))
+ (unless (zerop (call-process "git" nil '(t) nil "diff"
+ "--dirstat=cumulative,0"
+ prevno))
+ (error "Error signaled by git diff --dirstat %d" prevno)))
(goto-char (point-min))
- (while (re-search-forward "^ packages/\\([-[:alnum:]]+\\)/" nil t)
- (pushnew (match-string 1) pkgs :test #'equal))))
- (dolist (pkg pkgs)
- (condition-case v
- (if (file-directory-p pkg)
- (archive--make-changelog pkg))
- (error (message "Error: %S" v))))
- (write-region (number-to-string new-revno) nil wit nil 'quiet)))
+ (while (re-search-forward "^[ \t.0-9%]* packages/\\([-[:alnum:]]+\\)/$"
+ nil t)
+ (push (match-string 1) pkgs))))
+ (let ((default-directory (expand-file-name "packages/")))
+ (dolist (pkg pkgs)
+ (condition-case v
+ (if (file-directory-p pkg)
+ (archive--make-changelog pkg (expand-file-name "packages/"
+ srcdir)))
+ (error (message "Error: %S" v)))))
+ (write-region new-revno nil wit nil 'quiet)
+ ;; Also update the ChangeLog of external packages.
+ (let ((default-directory (expand-file-name "packages/")))
+ (dolist (dir (directory-files "."))
+ (and (not (member dir '("." "..")))
+ (file-directory-p dir)
+ (let ((index (expand-file-name
+ (concat "packages/" dir "/.git/index")
+ srcdir))
+ (cl (expand-file-name "ChangeLog" dir)))
+ (and (file-exists-p index)
+ (or (not (file-exists-p cl))
+ (file-newer-than-file-p index cl))))
+ (archive--make-changelog
+ dir (expand-file-name "packages/" srcdir)))))
+ ))
(defun archive--simple-package-p (dir pkg)
"Test whether DIR contains a simple package named PKG.
(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))
- version description req commentary)
+ version description req)
(dolist (file (prog1 files (setq files ())))
(unless (string-match "\\(?:\\.elc\\|~\\)\\'" file)
(push file files)))
(if requires-str
(setq req (mapcar 'archive--convert-require
(car (read-from-string requires-str))))))
- (setq commentary (lm-commentary))
- (list version description req commentary))))
+ (list version description req))))
((not (file-exists-p pkg-file))
(error "Can find single file nor package desc file in %s" dir)))))
-(defun archive--process-simple-package (dir pkg vers desc req commentary)
+(defun archive--process-simple-package (dir pkg vers desc req)
"Deploy the contents of DIR into the archive as a simple package.
-Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and write the
-package commentary to PKG-readme.txt. Return the descriptor."
- ;; Write the readme file.
- (with-temp-buffer
- (erase-buffer)
- (emacs-lisp-mode)
- (insert (or commentary
- (prog1 "No description"
- (message "Missing commentary in package %s" pkg))))
- (goto-char (point-min))
- (while (looking-at ";*[ \t]*\\(commentary[: \t]*\\)?\n")
- (delete-region (match-beginning 0)
- (match-end 0)))
- (uncomment-region (point-min) (point-max))
- (goto-char (point-max))
- (while (progn (forward-line -1)
- (looking-at "[ \t]*\n"))
- (delete-region (match-beginning 0)
- (match-end 0)))
- (write-region nil nil (concat pkg "-readme.txt")))
+Rename DIR/PKG.el to PKG-VERS.el, delete DIR, and return the descriptor."
;; Write DIR/foo.el to foo-VERS.el and delete DIR
(rename-file (expand-file-name (concat pkg ".el") dir)
(concat pkg "-" vers ".el"))
(delete-directory dir t)
(cons (intern pkg) (vector (version-to-list vers) req desc 'single)))
-(defun archive--make-changelog (dir)
- "Export Bzr log info of DIR into a ChangeLog file."
+(defun archive--make-changelog (dir srcdir)
+ "Export Git log info of DIR into a ChangeLog file."
(message "Refreshing ChangeLog in %S" dir)
(let ((default-directory (file-name-as-directory (expand-file-name dir))))
(with-temp-buffer
(if (file-readable-p "ChangeLog") (insert-file-contents "ChangeLog"))
(let ((old-md5 (md5 (current-buffer))))
(erase-buffer)
- ;; git --no-pager log --date=short --format="%cd %aN <%ae>%n%n%w(80,8,8)%B%n" | sed 's/^ /\t/'
- (call-process "bzr" nil (current-buffer) nil
- "log" "--gnu-changelog" ".")
+ (let ((default-directory
+ (file-name-as-directory (expand-file-name dir srcdir))))
+ (call-process "git" nil (current-buffer) nil
+ "log" "--date=short"
+ "--format=%cd %aN <%ae>%n%n%w(80,8,8)%B%n"
+ "."))
+ (tabify (point-min) (point-max))
+ (goto-char (point-min))
+ (while (re-search-forward "\n\n\n+" nil t)
+ (replace-match "\n\n"))
(if (equal old-md5 (md5 (current-buffer)))
(message "ChangeLog's md5 unchanged for %S" dir)
(write-region (point-min) (point-max) "ChangeLog" nil 'quiet)))))))
(defun archive--process-multi-file-package (dir pkg)
"Deploy the contents of DIR into the archive as a multi-file package.
-Rename DIR/ to PKG-VERS/, and write the package commentary to
-PKG-readme.txt. Return the descriptor."
+Rename DIR/ to PKG-VERS/, and return the descriptor."
(let* ((exp (archive--multi-file-package-def dir pkg))
(vers (nth 2 exp))
- (req (mapcar 'archive--convert-require (nth 4 exp)))
- (readme (expand-file-name "README" dir)))
+ (req (mapcar 'archive--convert-require (nth 4 exp))))
(unless (equal (nth 1 exp) pkg)
(error (format "Package name %s doesn't match file name %s"
(nth 1 exp) pkg)))
- ;; Write the readme file.
- (when (file-exists-p readme)
- (copy-file readme (concat pkg "-readme.txt") 'ok-if-already-exists))
(rename-file dir (concat pkg "-" vers))
(cons (intern pkg) (vector (version-to-list vers) req (nth 3 exp) 'tar))))
(goto-char (point-min))
(read (current-buffer)))))
-(defun batch-make-site-dir (package-dir site-dir)
- (require 'package)
- (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))
- (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 archive--refresh-pkg-file ()
(let* ((dir (directory-file-name default-directory))
(pkg (file-name-nondirectory dir))
;; (message "Not refreshing pkg description of %s" pkg)
)))
-(defun batch-make-site-package (sdir)
- (let* ((dest (car (file-attributes sdir)))
- (pkg (file-name-nondirectory (directory-file-name (or dest sdir))))
- (dir (or dest sdir)))
- (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 archive--write-pkg-file (pkg-dir name version desc requires &rest ignored)
(let ((pkg-file (expand-file-name (concat name "-pkg.el") pkg-dir))
(print-level nil)
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
</head>
<body>
-<h1 align=\"center\">%s</h1>"
+<h1 align=\"center\">%s</h1>\n"
title title))
(defun archive--html-bytes-format (bytes) ;Aka memory-usage-format.
(buffer-string)))))))
(defun archive--quote (txt)
- (replace-regexp-in-string "<" "<"
- (replace-regexp-in-string "&" "&" txt)))
+ (replace-regexp-in-string "<" "<"
+ (replace-regexp-in-string "&" "&" txt)))
+
+(defun archive--insert-repolinks (name srcdir mainsrcfile)
+ (let ((url (archive--get-prop "URL" name srcdir mainsrcfile)))
+ (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))))))
(defun archive--html-make-pkg (pkg files)
(let* ((name (symbol-name (car pkg)))
(let ((maint (archive--get-prop "Maintainer" name srcdir mainsrcfile)))
(when maint
(insert (format "<p>Maintainer: %s</p>\n" (archive--quote maint)))))
- (let* ((urlkind "Origin")
- (url
- (or (archive--get-prop "URL" name srcdir mainsrcfile)
- (progn
- (setq urlkind "Repository")
- (concat "http://bzr.sv.gnu.org/lh/emacs/elpa/files/head:/packages/" name)))))
- (insert (format "<p>%s: <a href=%S>%s</a></p>"
- urlkind url (archive--quote url))))
+ (archive--insert-repolinks name srcdir mainsrcfile)
(let ((readme (archive--get-section "Commentary" "README" srcdir mainsrcfile)))
(when readme
+ (write-region readme nil (concat name "-readme.txt"))
(insert "<h2>Full description</h2><pre>\n" (archive--quote readme)
"\n</pre>\n")))
(unless (< (length files) 2)
;;; Maintain external packages.
-(defun archive-add/remove-externals ()
+(defun archive-add/remove/update-externals ()
(let ((exts (with-current-buffer (find-file-noselect "externals-list")
(goto-char (point-min))
(read (current-buffer)))))
(progn (delete-directory dir 'recursive t)
(message "Deleted all of %s" dir))
(message "Keeping leftover unclean %s:\n%s" dir status))))))
- (pcase-dolist (`(,dir ,kind ,url) exts)
+ (pcase-dolist (`(,dir ,kind ,_url) exts)
(cond
+ ((eq kind :subtree) nil) ;Nothing to do.
+ ((not (eq kind :external))
+ (message "Unknown external package kind `%S' for %s" kind dir))
((not (file-exists-p dir))
(let* ((branch (concat "externals/" dir))
(output
branch (concat "origin/" branch))
(call-process "git" nil t nil "clone"
"--shared" "--branch" branch "../" dir)
- ;; (let ((default-directory (file-name-as-directory
- ;; (expand-file-name dir))))
- ;; (call-process "git" nil t nil "branch"
- ;; "-m" branch "master"))
+ (let ((default-directory (file-name-as-directory
+ (expand-file-name dir))))
+ ;; (call-process "git" nil t nil "branch"
+ ;; "-m" branch "master")
+ (call-process "git" nil t nil "remote"
+ "set-url" "--push" "origin"
+ "git+ssh://git.sv.gnu.org/srv/git/emacs/elpa.git"))
(buffer-string))))
(message "Cloning branch %s:\n%s" dir output)))
((not (file-directory-p (concat dir "/.git")))
(message "%s is in the way of an external, please remove!" dir))
(t
- (let ((default-directory (expand-file-name dir)))
+ (let ((default-directory (file-name-as-directory
+ (expand-file-name dir))))
(with-temp-buffer
+ (message "Running git pull in %S" default-directory)
(call-process "git" nil t nil "pull")
(message "Updated %s:%s" dir (buffer-string))))
))))))
+++ /dev/null
-#/bin/bash
-## package-update.sh -- Create a package archive from the elpa repository
-
-## Usage: ./package-update.sh DEST [FULL-UPDATE]
-##
-## This creates a package archive beginning in DEST.
-##
-## The package archive itself is created in DEST/packages. This dir
-## contains the package files.
-##
-## If a second argument FULL-UPDATE is specified (whatever its value),
-## also create the following:
-## - the archive admin scripts in DEST/admin
-## - a tarball containing the entire archive in
-## DEST/packages/emacs-packages-latest.tgz
-## - the Org mode daily package
-
-PATH="/bin:/usr/bin:/usr/local/bin:${PATH}"
-## Remove any trailing slash from DEST
-DEST=${1%/}
-FULL=$2
-
-EMACS=emacs
-BZR=bzr
-TAR=tar
-REPO_PACKAGES=packages
-
-## Parse arguments
-if [ -z $DEST ]; then
- echo "Syntax: $0 DEST [fetch-extras-boolean]"
- exit 1
-elif [ -d $DEST ]; then
- cd $DEST
- DEST_FULL=$(pwd)
- PKGROOT=$DEST_FULL/packages
- TMP_PKGROOT=$DEST_FULL/packages-new
- echo "Installing into '$DEST_FULL'"
- if [ -z $FULL ]; then
- echo "Base archive update only (pass second arg for full update)."
- else
- echo "Performing full archive update."
- TARBALL=$PKGROOT/emacs-packages-latest.tgz
- TARBALL_ROOT="emacs-24.1-packages-`/bin/date +'%F'`"
- ADMINROOT=$DEST_FULL/admin
- REPO_ADMIN=admin
- fi
-else
- echo "Sorry but $DEST is not a directory, aborting."
- exit 1
-fi
-
-## Change to the bzr root directory
-REPO_ROOT_DIR=`$BZR root`;
-if [ -z $REPO_ROOT_DIR ]; then
- "This script should be run from a bzr repository, aborting."
- exit 1
-else
- cd $REPO_ROOT_DIR;
-fi
-
-## Create the working directory that will be the world-facing copy of
-## the package archive base.
-echo "Exporting packages to temporary working directory $TMP_PKGROOT"
-rm -rf $TMP_PKGROOT
-$BZR export $TMP_PKGROOT $REPO_PACKAGES
-
-## If second arg is provided, copy in the admin directory.
-if [ -z $FULL ]; then
- echo "Skipping admin directory"
-else
- echo "Exporting admin scripts to $ADMINROOT"
- rm -rf $ADMINROOT
- $BZR export $ADMINROOT $REPO_ADMIN
-fi
-
-
-cd $TMP_PKGROOT
-
-
-## If second arg is provided, grab the Org daily
-if [ -z $FULL ]; then
- echo "Not fetching Org daily from orgmode.org"
-else
- echo "Fetching Org daily from orgmode.org"
- pkgname=`curl -s http://orgmode.org/elpa/|perl -ne 'push @f, $1 if m/(org-\d{8})\.tar/; END { @f = sort @f; print "$f[-1]\n"}'`
- wget -q http://orgmode.org/elpa/${pkgname}.tar -O ${pkgname}.tar
- if [ -f ${pkgname}.tar ]; then
- tar xf ${pkgname}.tar
- rm -f ${pkgname}.tar
- mv ${pkgname} org
- fi
-fi
-
-## Call `batch-make-archive' to generate archive-contents, the readme
-## files, etc.
-$EMACS -batch -l $REPO_ROOT_DIR/admin/archive-contents.el -f batch-make-archive
-
-## Tar up the multi-file packages.
-echo "Creating multi-file package tarballs in $TMP_PKGROOT"
-for pt in *; do
- if [ -d $pt ]; then
- echo "Creating tarball $TMP_PKGROOT/$pt.tar"
- tar -cf $pt.tar $pt --remove-files
- fi
-done
-
-## Move the working directory to its final location
-cd ..
-rm -rf $PKGROOT-old
-if [ -d $PKGROOT ]; then
- mv $PKGROOT $PKGROOT-old
-fi
-mv $TMP_PKGROOT $PKGROOT
-rm -rf $PKGROOT-old
-
-## If doing a full update, make a tarball of the entire archive.
-if [ -z $FULL ]; then
- echo "Skipping archive tarball"
-else
- echo "Exporting packages into $TARBALL (root = $TARBALL_ROOT)"
- cd $REPO_ROOT_DIR
- $BZR export --format=tgz --root=$TARBALL_ROOT $TARBALL $REPO_PACKAGES
-fi
-
-chmod -R a+rX $PKGROOT
-echo "Update complete at" `/bin/date`