diff options
| author | Glenn Morris | 2013-03-11 01:09:21 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-03-11 01:09:21 -0700 |
| commit | c69f46735f5bde557071785117eb0759829dc19c (patch) | |
| tree | 0bf0abed97c860e7b77ebd945a1a456cc4f5e67a /admin | |
| parent | 24958590a00900371b6b3b154fc1df5c980d056c (diff) | |
| download | emacs-c69f46735f5bde557071785117eb0759829dc19c.tar.gz emacs-c69f46735f5bde557071785117eb0759829dc19c.zip | |
Small updates for make-manuals admin scripts
* admin/admin.el (make-manuals): Add emacs-lisp-intro and some more
doc/misc manuals.
(manual-html-mono, manual-html-node, manual-txt): Pass -I to makeinfo.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 7 | ||||
| -rw-r--r-- | admin/admin.el | 40 |
2 files changed, 41 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 20a1fcc4b65..6c9ed389528 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2013-03-11 Glenn Morris <rgm@gnu.org> | 1 | 2013-03-11 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * admin.el (make-manuals): Add emacs-lisp-intro and some more | ||
| 4 | doc/misc manuals. | ||
| 5 | (manual-html-mono, manual-html-node, manual-txt): | ||
| 6 | Pass -I to makeinfo. | ||
| 7 | |||
| 8 | 2013-03-11 Glenn Morris <rgm@gnu.org> | ||
| 9 | |||
| 3 | * Version 24.3 released. | 10 | * Version 24.3 released. |
| 4 | 11 | ||
| 5 | 2012-10-12 Kenichi Handa <handa@gnu.org> | 12 | 2012-10-12 Kenichi Handa <handa@gnu.org> |
diff --git a/admin/admin.el b/admin/admin.el index b1a9b37a96e..08d9039d4bc 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -211,17 +211,33 @@ Root must be the root of an Emacs source tree." | |||
| 211 | (manual-pdf texi (expand-file-name "elisp.pdf" dest)) | 211 | (manual-pdf texi (expand-file-name "elisp.pdf" dest)) |
| 212 | (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir) | 212 | (manual-dvi texi (expand-file-name "elisp.dvi" dvi-dir) |
| 213 | (expand-file-name "elisp.ps" ps-dir))) | 213 | (expand-file-name "elisp.ps" ps-dir))) |
| 214 | (let ((texi (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root)) | ||
| 215 | (dest (expand-file-name "emacs-lisp-intro" dest)) | ||
| 216 | dest2 dest3) | ||
| 217 | ;; Mimic the atypical directory layout used for emacs-lisp-intro. | ||
| 218 | (make-directory dest) | ||
| 219 | (make-directory (setq dest2 (expand-file-name "html_node" dest))) | ||
| 220 | (manual-html-node texi dest2) | ||
| 221 | (make-directory (setq dest2 (expand-file-name "html_mono" dest))) | ||
| 222 | (manual-html-mono texi (expand-file-name "emacs-lisp-intro.html" dest2)) | ||
| 223 | (make-directory (setq dest2 (expand-file-name "txt" dest))) | ||
| 224 | (manual-txt texi (expand-file-name "emacs-lisp-intro.txt" dest2)) | ||
| 225 | (manual-pdf texi (expand-file-name "emacs-lisp-intro.pdf" dest)) | ||
| 226 | (make-directory (setq dest2 (expand-file-name "dvi" dest))) | ||
| 227 | (make-directory (setq dest3 (expand-file-name "ps" dest))) | ||
| 228 | (manual-dvi texi (expand-file-name "emacs-lisp-intro.dvi" dest2) | ||
| 229 | (expand-file-name "emacs-lisp-intro.ps" dest3))) | ||
| 214 | ;; Misc manuals | 230 | ;; Misc manuals |
| 215 | (let ((manuals '("ada-mode" "auth" "autotype" "calc" "cc-mode" | 231 | (let ((manuals '("ada-mode" "auth" "autotype" "bovine" "calc" "cc-mode" |
| 216 | "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff" | 232 | "cl" "dbus" "dired-x" "ebrowse" "ede" "ediff" |
| 217 | "edt" "eieio" "emacs-mime" "epa" "erc" "ert" | 233 | "edt" "eieio" "emacs-gnutls" "emacs-mime" "epa" "erc" "ert" |
| 218 | "eshell" "eudc" "faq" "flymake" "forms" | 234 | "eshell" "eudc" "faq" "flymake" "forms" |
| 219 | "gnus" "emacs-gnutls" "idlwave" "info" | 235 | "gnus" "htmlfontify" "idlwave" "info" |
| 220 | "mairix-el" "message" "mh-e" "newsticker" | 236 | "mairix-el" "message" "mh-e" "newsticker" |
| 221 | "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc" | 237 | "nxml-mode" "org" "pcl-cvs" "pgg" "rcirc" |
| 222 | "remember" "reftex" "sasl" "sc" "semantic" | 238 | "reftex" "remember" "sasl" "sc" "semantic" |
| 223 | "ses" "sieve" "smtpmail" "speedbar" "tramp" | 239 | "ses" "sieve" "smtpmail" "speedbar" "srecode" "tramp" |
| 224 | "url" "vip" "viper" "widget" "woman"))) | 240 | "url" "vip" "viper" "widget" "wisent" "woman"))) |
| 225 | (dolist (manual manuals) | 241 | (dolist (manual manuals) |
| 226 | (manual-misc-html manual root html-node-dir html-mono-dir))) | 242 | (manual-misc-html manual root html-node-dir html-mono-dir))) |
| 227 | (message "Manuals created in %s" dest))) | 243 | (message "Manuals created in %s" dest))) |
| @@ -252,6 +268,10 @@ This function also edits the HTML files so that they validate as | |||
| 252 | HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using | 268 | HTML 4.01 Transitional, and pulls in the gnu.org stylesheet using |
| 253 | the @import directive." | 269 | the @import directive." |
| 254 | (call-process "makeinfo" nil nil nil | 270 | (call-process "makeinfo" nil nil nil |
| 271 | "-I" (expand-file-name "../emacs" | ||
| 272 | (file-name-directory texi-file)) | ||
| 273 | "-I" (expand-file-name "../misc" | ||
| 274 | (file-name-directory texi-file)) | ||
| 255 | "--html" "--no-split" texi-file "-o" dest) | 275 | "--html" "--no-split" texi-file "-o" dest) |
| 256 | (with-temp-buffer | 276 | (with-temp-buffer |
| 257 | (insert-file-contents dest) | 277 | (insert-file-contents dest) |
| @@ -273,6 +293,10 @@ the @import directive." | |||
| 273 | (unless (file-exists-p texi-file) | 293 | (unless (file-exists-p texi-file) |
| 274 | (error "Manual file %s not found" texi-file)) | 294 | (error "Manual file %s not found" texi-file)) |
| 275 | (call-process "makeinfo" nil nil nil | 295 | (call-process "makeinfo" nil nil nil |
| 296 | "-I" (expand-file-name "../emacs" | ||
| 297 | (file-name-directory texi-file)) | ||
| 298 | "-I" (expand-file-name "../misc" | ||
| 299 | (file-name-directory texi-file)) | ||
| 276 | "--html" texi-file "-o" dir) | 300 | "--html" texi-file "-o" dir) |
| 277 | ;; Loop through the node files, fixing them up. | 301 | ;; Loop through the node files, fixing them up. |
| 278 | (dolist (f (directory-files dir nil "\\.html\\'")) | 302 | (dolist (f (directory-files dir nil "\\.html\\'")) |
| @@ -304,6 +328,10 @@ the @import directive." | |||
| 304 | (defun manual-txt (texi-file dest) | 328 | (defun manual-txt (texi-file dest) |
| 305 | "Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST." | 329 | "Run Makeinfo on TEXI-FILE, emitting plaintext output to DEST." |
| 306 | (call-process "makeinfo" nil nil nil | 330 | (call-process "makeinfo" nil nil nil |
| 331 | "-I" (expand-file-name "../emacs" | ||
| 332 | (file-name-directory texi-file)) | ||
| 333 | "-I" (expand-file-name "../misc" | ||
| 334 | (file-name-directory texi-file)) | ||
| 307 | "--plaintext" "--no-split" texi-file "-o" dest) | 335 | "--plaintext" "--no-split" texi-file "-o" dest) |
| 308 | (shell-command (concat "gzip -c " dest " > " (concat dest ".gz")))) | 336 | (shell-command (concat "gzip -c " dest " > " (concat dest ".gz")))) |
| 309 | 337 | ||