X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f78ee6afc094cdfd6162bfd645836e84875dcddf..7225c83207c8f28eeb919c39337e1e44582dff2c:/admin/admin.el diff --git a/admin/admin.el b/admin/admin.el index ec78fb2786..cb7eaead27 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -1,6 +1,6 @@ ;;; 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. @@ -28,25 +28,38 @@ (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)) @@ -215,17 +228,33 @@ Root must be the root of an Emacs source tree." (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))) @@ -256,6 +285,11 @@ This function also edits the HTML files so that they validate as 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) @@ -277,6 +311,11 @@ the @import directive." (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\\'")) @@ -308,17 +347,31 @@ the @import directive." (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))