;;; admin.el --- utilities for Emacs administration
-;; Copyright (C) 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
(defvar add-log-time-format) ; in add-log
-(defun add-release-logs (root version)
+;; Does this information need to be in every ChangeLog, as opposed to
+;; just the top-level one? Only if you allow changes the same
+;; day as the release.
+;; http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00161.html
+(defun add-release-logs (root version &optional date)
"Add \"Version VERSION released.\" change log entries in ROOT.
-Root must be the root of an Emacs source tree."
- (interactive "DEmacs root directory: \nNVersion number: ")
+Root must be the root of an Emacs source tree.
+Optional argument DATE is the release date, default today."
+ (interactive (list (read-directory-name "Emacs root directory: ")
+ (read-string "Version number: "
+ (format "%s.%s" emacs-major-version
+ emacs-minor-version))
+ (read-string "Release date: "
+ (progn (require 'add-log)
+ (let ((add-log-time-zone-rule t))
+ (funcall add-log-time-format))))))
(setq root (expand-file-name root))
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
(error "%s doesn't seem to be the root of an Emacs source tree" root))
(require 'add-log)
+ (or date (setq date (let ((add-log-time-zone-rule t))
+ (funcall add-log-time-format))))
(let* ((logs (process-lines "find" root "-name" "ChangeLog"))
(entry (format "%s %s <%s>\n\n\t* Version %s released.\n\n"
- (funcall add-log-time-format)
+ date
(or add-log-full-name (user-full-name))
(or add-log-mailing-address user-mail-address)
version)))
(dolist (log logs)
- (unless (string-match "/gnus/" log)
- (find-file log)
- (goto-char (point-min))
- (insert entry)))))
+ (find-file log)
+ (goto-char (point-min))
+ (insert entry))))
(defun set-version-in-file (root file version rx)
(find-file (expand-file-name file root))
(rx (and "\"ProductVersion\"" (0+ space) ?,
(0+ space) ?\" (submatch (1+ (in "0-9, ")))
"\\0\"")))
+ ;; Major version only.
(when (string-match "\\([0-9]\\{2,\\}\\)" version)
(setq version (match-string 1 version))
+ (set-version-in-file root "src/msdos.c" version
+ (rx (and "Vwindow_system_version" (1+ not-newline)
+ ?\( (submatch (1+ (in "0-9"))) ?\))))
(set-version-in-file root "etc/refcards/ru-refcard.tex" version
"\\\\newcommand{\\\\versionemacs}\\[0\\]\
{\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs")
(set-version-in-file root "configure.ac" copyright
(rx (and bol "copyright" (0+ (not (in ?\")))
?\" (submatch (1+ (not (in ?\")))) ?\")))
+ (set-version-in-file root "msdos/sed2v2.inp" copyright
+ (rx (and bol "/^#undef " (1+ not-newline)
+ "define COPYRIGHT" (1+ space)
+ ?\" (submatch (1+ (not (in ?\")))) ?\")))
(set-version-in-file root "nt/config.nt" copyright
(rx (and bol "#" (0+ blank) "define" (1+ blank)
"COPYRIGHT" (1+ blank)
(manual-pdf texi (expand-file-name "elisp.pdf" dest))
(manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir)
(expand-file-name "elisp.ps" ps-dir)))
+ (let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
+ (dest (expand-file-name "emacs-lisp-intro" dest))
+ dest2 dest3)
+ ;; Mimic the atypical directory layout used for emacs-lisp-intro.
+ (make-directory dest)
+ (make-directory (setq dest2 (expand-file-name "html_node" dest)))
+ (manual-html-node texi dest2)
+ (make-directory (setq dest2 (expand-file-name "html_mono" dest)))
+ (manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2))
+ (make-directory (setq dest2 (expand-file-name "txt" dest)))
+ (manual-txt texi (expand-file-name "emacs-lisp-intro.txt" dest2))
+ (manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest))
+ (make-directory (setq dest2 (expand-file-name "dvi" dest)))
+ (make-directory (setq dest3 (expand-file-name "ps" dest)))
+ (manual-dvi texi (expand-file-name "emacs-lisp-intro.dvi" dest2)
+ (expand-file-name "emacs-lisp-intro.ps" dest3)))
;; Misc manuals
- (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode"
+ (let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode"
"cl" "dbus" "dired-x" "ebrowse" "ede" "ediff"
- "edt" "eieio" "emacs-mime" "epa" "erc" "ert"
+ "edt" "eieio" "emacs-gnutls" "emacs-mime" "epa" "erc" "ert"
"eshell" "eudc" "faq" "flymake" "forms"
- "gnus" "emacs-gnutls" "idlwave" "info"
+ "gnus" "htmlfontify" "idlwave" "info"
"mairix-el" "message" "mh-e" "newsticker"
"nxml-mode" "org" "pcl-cvs" "pgg" "rcirc"
- "remember" "reftex" "sasl" "sc" "semantic"
- "ses" "sieve" "smtpmail" "speedbar" "tramp"
- "url" "vip" "viper" "widget" "woman")))
+ "reftex" "remember" "sasl" "sc" "semantic"
+ "ses" "sieve" "smtpmail" "speedbar" "srecode" "tramp"
+ "url" "vip" "viper" "widget" "wisent" "woman")))
(dolist (manual manuals)
(manual-misc-html manual root html-node-dir html-mono-dir)))
(message "Manuals created in %s" dest)))
HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using
the @import directive."
(call-process "makeinfo" nil nil nil
+ "-D" "WWW_GNU_ORG"
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
"--html" "--no-split" texi-file "-o" dest)
(with-temp-buffer
(insert-file-contents dest)
(unless (file-exists-p texi-file)
(error "Manual file %s not found" texi-file))
(call-process "makeinfo" nil nil nil
+ "-D" "WWW_GNU_ORG"
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
"--html" texi-file "-o" dir)
;; Loop through the node files, fixing them up.
(dolist (f (directory-files dir nil "\\.html\\'"))
(defun manual-txt (texi-file dest)
"Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST."
(call-process "makeinfo" nil nil nil
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
"--plaintext" "--no-split" texi-file "-o" dest)
(shell-command (concat "gzip -c " dest " > " (concat dest ".gz"))))
(defun manual-pdf (texi-file dest)
"Run texi2pdf on TEXI-FILE, emitting plaintext output to DEST."
- (call-process "texi2pdf" nil nil nil texi-file "-o" dest))
+ (call-process "texi2pdf" nil nil nil
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
+ texi-file "-o" dest))
(defun manual-dvi (texi-file dest ps-dest)
"Run texi2dvi on TEXI-FILE, emitting dvi output to DEST.
Also generate PostScript output in PS-DEST."
- (call-process "texi2dvi" nil nil nil texi-file "-o" dest)
+ (call-process "texi2dvi" nil nil nil
+ "-I" (expand-file-name "../emacs"
+ (file-name-directory texi-file))
+ "-I" (expand-file-name "../misc"
+ (file-name-directory texi-file))
+ texi-file "-o" dest)
(call-process "dvips" nil nil nil dest "-o" ps-dest)
(call-process "gzip" nil nil nil dest)
(call-process "gzip" nil nil nil ps-dest))
))
"{}" "+"))
-;; TODO if a defgroup with a version tag, apply to all customs in that
-;; group (eg for new files).
+(defvar cusver-new-version (format "%s.%s" emacs-major-version
+ (1+ emacs-minor-version))
+ "Version number that new defcustoms should have.")
+
(defun cusver-scan (file &optional old)
"Scan FILE for `defcustom' calls.
Return a list with elements of the form (VAR . VER),
If optional argument OLD is non-nil, also scan for defvars."
(let ((m (format "Scanning %s..." file))
(re (format "^[ \t]*\\((def%s\\)[ \t\n]"
- (if old "\\(?:custom\\|var\\)" "custom")))
- alist var ver form)
+ (if old "\\(custom\\|var\\)" "\\(custom\\|group\\)")))
+ alist var ver form glist grp)
(message "%s" m)
(with-temp-buffer
(insert-file-contents file)
(while (re-search-forward re nil t)
(goto-char (match-beginning 1))
(if (and (setq form (ignore-errors (read (current-buffer))))
- (setq var (car-safe (cdr-safe form)))
+ (setq var (car-safe (cdr-safe form)))
;; Exclude macros, eg (defcustom ,varname ...).
(symbolp var))
- (setq ver (car (cdr-safe (memq :version form)))
- alist (cons (cons var ver) alist))
+ (progn
+ (setq ver (car (cdr-safe (memq :version form))))
+ (if (equal "group" (match-string 2))
+ ;; Group :version could be old.
+ (if (equal ver cusver-new-version)
+ (setq glist (cons (cons var ver) glist)))
+ ;; If it specifies a group and the whole group has a
+ ;; version. use that.
+ (unless ver
+ (setq grp (car (cdr-safe (memq :group form))))
+ (and grp
+ (setq grp (car (cdr-safe grp))) ; (quote foo) -> foo
+ (setq ver (assq grp glist))))
+ (setq alist (cons (cons var ver) alist))))
(if form (message "Malformed defcustom: `%s'" form)))))
(message "%sdone" m)
alist))
+(defun cusver-scan-cus-start (file)
+ "Scan cus-start.el and return an alist with elements (VAR . VER)."
+ (if (file-readable-p file)
+ (with-temp-buffer
+ (insert-file-contents file)
+ (when (search-forward "(let ((all '(" nil t)
+ (backward-char 1)
+ (let (var ver alist)
+ (dolist (elem (ignore-errors (read (current-buffer))))
+ (when (symbolp (setq var (car-safe elem)))
+ (or (stringp (setq ver (nth 3 elem)))
+ (setq ver nil))
+ (setq alist (cons (cons var ver) alist))))
+ alist)))))
+
(define-button-type 'cusver-xref 'action #'cusver-goto-xref)
(defun cusver-goto-xref (button)
(pop-to-buffer (current-buffer))))))
;; You should probably at least do a grep over the old directory
-;; to check the results of this look sensible. Eg cus-start if
-;; something moved from C to Lisp.
-;; TODO handle renamed things with aliases to the old names.
-;; What to do about new files? Does everything in there need a :version,
-;; or eg just the defgroup?
-(defun cusver-check (newdir olddir)
+;; to check the results of this look sensible.
+;; TODO Check cus-start if something moved from C to Lisp.
+;; TODO Handle renamed things with aliases to the old names.
+(defun cusver-check (newdir olddir version)
"Check that defcustoms have :version tags where needed.
NEWDIR is the current lisp/ directory, OLDDIR is that from the previous
release. A defcustom that is only in NEWDIR should have a :version
Note that a :version tag should also be added if the value of a defcustom
changes (in a non-trivial way). This function does not check for that."
- (interactive "DNew Lisp directory: \nDOld Lisp directory: ")
+ (interactive (list (read-directory-name "New Lisp directory: ")
+ (read-directory-name "Old Lisp directory: ")
+ (number-to-string
+ (read-number "New version number: "
+ (string-to-number cusver-new-version)))))
(or (file-directory-p (setq newdir (expand-file-name newdir)))
(error "Directory `%s' not found" newdir))
(or (file-directory-p (setq olddir (expand-file-name olddir)))
(error "Directory `%s' not found" olddir))
+ (setq cusver-new-version version)
(let* ((newfiles (progn (message "Finding new files with defcustoms...")
(cusver-find-files newdir)))
(oldfiles (progn (message "Finding old files with defcustoms...")
(message "Reading old defcustoms...")
(dolist (file oldfiles)
(setq oldcus (append oldcus (cusver-scan file t))))
+ (setq oldcus (append oldcus (cusver-scan-cus-start
+ (expand-file-name "cus-start.el" olddir))))
;; newcus has elements (FILE (VAR VER) ... ).
;; oldcus just (VAR . VER).
(message "Checking for version tags...")