2001-10-19 16:33:45 +00:00
|
|
|
|
;;; admin.el --- utilities for Emacs administration
|
|
|
|
|
|
|
2015-01-01 22:26:41 +00:00
|
|
|
|
;; Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
2008-05-09 23:48:10 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2001-10-19 16:33:45 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-09 23:48:10 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-09 23:48:10 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
2005-04-14 09:03:03 +00:00
|
|
|
|
;; add-release-logs Add ``Version X released'' change log entries.
|
|
|
|
|
|
;; set-version Change Emacs version number in source tree.
|
2013-12-24 04:41:18 +00:00
|
|
|
|
;; set-copyright Change Emacs short copyright string (eg as
|
2007-06-07 07:28:32 +00:00
|
|
|
|
;; printed by --version) in source tree.
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
2012-09-17 07:35:17 +00:00
|
|
|
|
(defvar add-log-time-format) ; in add-log
|
|
|
|
|
|
|
2013-03-09 20:19:41 +00:00
|
|
|
|
(defun add-release-logs (root version &optional date)
|
2001-10-19 16:33:45 +00:00
|
|
|
|
"Add \"Version VERSION released.\" change log entries in ROOT.
|
2013-03-09 20:19:41 +00:00
|
|
|
|
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)
|
New optional ZONE arg for format-time-string etc.
This simplifies time conversions in other time zones.
It also prevents display-time-world tampering with TZ (Bug#21020).
* admin/admin.el (add-release-logs):
Use improved add-log-time-format API.
* admin/merge-gnulib (GNULIB_MODULES): Add time_rz, timegm.
(GNULIB_TOOL_FLAGS): Avoid flexmember, setenv, unsetenv.
* configure.ac (tzalloc): Remove test for this, since
Emacs no longer uses HAVE_TZALLOC directly.
* doc/lispref/os.texi (Time of Day, Time Conversion)
(Time Parsing):
* etc/NEWS: Document the new behavior.
Merge from gnulib, incorporating:
2015-07-25 strftime: fix newly-introduced bug on Solaris
2015-07-23 fprintftime, strftime: use timezone_t args
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/strftime.c, lib/strftime.h, lib/time.in.h, m4/sys_time_h.m4:
* m4/time_h.m4:
Update from gnulib.
* lib/time_rz.c, lib/timegm.c, m4/time_rz.m4, m4/timegm.m4:
New files from gnulib.
* lisp/time-stamp.el (time-stamp-string):
* lisp/time.el (display-time-world-list)
(display-time-world-display):
Use new API, with time zone arg.
* lisp/time.el (display-time-world-display):
Fix race when current-time advances while we're running.
* lisp/vc/add-log.el (add-log-iso8601-time-zone)
(add-log-iso8601-time-string): Accept optional time zone arg.
* lisp/vc/add-log.el (add-change-log-entry):
* lisp/vc/log-edit.el (log-edit-changelog-ours-p): Use new arg.
* nt/gnulib.mk: Propagate lib/gnulib.mk changes here.
Add rules for the time module, since they're now needed
for tzalloc etc.
* src/conf_post.h (getenv_TZ, setenv_TZ): New macros.
(emacs_getenv_TZ, emacs_setenv_TZ): New decls.
* src/editfns.c: Include errno.h.
(set_time_zone_rule): Omit unnecessary forward decl.
(initial_tz): Remove, replacing with ...
(local_tz, wall_clock_tz, utc_tz): New static vars and constants.
(tzeqlen): New constant; prefer it to (sizeof "TZ=" - 1).
(emacs_localtime_rz, emacs_mktime_z, xtzalloc, xtzfree)
(tzlookup): New static functions.
(init_editfns): New arg DUMPING. All uses changed.
(init_editfns): Omit most initialization if dumping, not if
!initialized. Initialize wall_clock_tz and local_tz.
(emacs_nmemftime, format_time_string): Time zone argument can now
be any time zone, not just a boolean for UTC or local time. All
callers changed.
(Fformat_time_string, Fencode_time, Fcurrent_time_string)
(Fcurrent_time_zone): New optional arg ZONE.
(Fdecode_time, Fset_time_zone_rule): ZONE arg can now also take
the same form as with the other new additions.
(decode_time_zone): Remove; no longer needed.
(tzvalbuf): Now file-scope.
(emacs_getenv_TZ, emacs_setenv_TZ): New functions.
(syms_of_editfns): Define Qwall.
* src/editfns.c (mktime_z) [!HAVE_TZALLOC]:
* src/systime.h (mktime_z, timezone_t, tzalloc, tzfree)
[!HAVE_TZALLOC]:
Remove; now supplied by gnulib.
* src/emacs.c (main):
* src/lisp.h (init_editfns): Adjust to init_editfns API change.
2015-07-26 07:01:34 +00:00
|
|
|
|
(funcall add-log-time-format nil t)))))
|
2003-01-17 14:48:15 +00:00
|
|
|
|
(setq root (expand-file-name root))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
|
2013-12-24 04:41:18 +00:00
|
|
|
|
(user-error "%s doesn't seem to be the root of an Emacs source tree" root))
|
2005-04-14 09:03:03 +00:00
|
|
|
|
(require 'add-log)
|
New optional ZONE arg for format-time-string etc.
This simplifies time conversions in other time zones.
It also prevents display-time-world tampering with TZ (Bug#21020).
* admin/admin.el (add-release-logs):
Use improved add-log-time-format API.
* admin/merge-gnulib (GNULIB_MODULES): Add time_rz, timegm.
(GNULIB_TOOL_FLAGS): Avoid flexmember, setenv, unsetenv.
* configure.ac (tzalloc): Remove test for this, since
Emacs no longer uses HAVE_TZALLOC directly.
* doc/lispref/os.texi (Time of Day, Time Conversion)
(Time Parsing):
* etc/NEWS: Document the new behavior.
Merge from gnulib, incorporating:
2015-07-25 strftime: fix newly-introduced bug on Solaris
2015-07-23 fprintftime, strftime: use timezone_t args
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/strftime.c, lib/strftime.h, lib/time.in.h, m4/sys_time_h.m4:
* m4/time_h.m4:
Update from gnulib.
* lib/time_rz.c, lib/timegm.c, m4/time_rz.m4, m4/timegm.m4:
New files from gnulib.
* lisp/time-stamp.el (time-stamp-string):
* lisp/time.el (display-time-world-list)
(display-time-world-display):
Use new API, with time zone arg.
* lisp/time.el (display-time-world-display):
Fix race when current-time advances while we're running.
* lisp/vc/add-log.el (add-log-iso8601-time-zone)
(add-log-iso8601-time-string): Accept optional time zone arg.
* lisp/vc/add-log.el (add-change-log-entry):
* lisp/vc/log-edit.el (log-edit-changelog-ours-p): Use new arg.
* nt/gnulib.mk: Propagate lib/gnulib.mk changes here.
Add rules for the time module, since they're now needed
for tzalloc etc.
* src/conf_post.h (getenv_TZ, setenv_TZ): New macros.
(emacs_getenv_TZ, emacs_setenv_TZ): New decls.
* src/editfns.c: Include errno.h.
(set_time_zone_rule): Omit unnecessary forward decl.
(initial_tz): Remove, replacing with ...
(local_tz, wall_clock_tz, utc_tz): New static vars and constants.
(tzeqlen): New constant; prefer it to (sizeof "TZ=" - 1).
(emacs_localtime_rz, emacs_mktime_z, xtzalloc, xtzfree)
(tzlookup): New static functions.
(init_editfns): New arg DUMPING. All uses changed.
(init_editfns): Omit most initialization if dumping, not if
!initialized. Initialize wall_clock_tz and local_tz.
(emacs_nmemftime, format_time_string): Time zone argument can now
be any time zone, not just a boolean for UTC or local time. All
callers changed.
(Fformat_time_string, Fencode_time, Fcurrent_time_string)
(Fcurrent_time_zone): New optional arg ZONE.
(Fdecode_time, Fset_time_zone_rule): ZONE arg can now also take
the same form as with the other new additions.
(decode_time_zone): Remove; no longer needed.
(tzvalbuf): Now file-scope.
(emacs_getenv_TZ, emacs_setenv_TZ): New functions.
(syms_of_editfns): Define Qwall.
* src/editfns.c (mktime_z) [!HAVE_TZALLOC]:
* src/systime.h (mktime_z, timezone_t, tzalloc, tzfree)
[!HAVE_TZALLOC]:
Remove; now supplied by gnulib.
* src/emacs.c (main):
* src/lisp.h (init_editfns): Adjust to init_editfns API change.
2015-07-26 07:01:34 +00:00
|
|
|
|
(or date (setq date (funcall add-log-time-format nil t)))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(let* ((logs (process-lines "find" root "-name" "ChangeLog"))
|
|
|
|
|
|
(entry (format "%s %s <%s>\n\n\t* Version %s released.\n\n"
|
2013-03-09 20:19:41 +00:00
|
|
|
|
date
|
2003-01-17 14:48:15 +00:00
|
|
|
|
(or add-log-full-name (user-full-name))
|
|
|
|
|
|
(or add-log-mailing-address user-mail-address)
|
|
|
|
|
|
version)))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(dolist (log logs)
|
2013-03-09 20:19:41 +00:00
|
|
|
|
(find-file log)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(insert entry))))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
(defun set-version-in-file (root file version rx)
|
2013-12-24 06:52:10 +00:00
|
|
|
|
"Subroutine of `set-version' and `set-copyright'."
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(find-file (expand-file-name file root))
|
|
|
|
|
|
(goto-char (point-min))
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(setq version (format "%s" version))
|
2013-12-24 04:41:18 +00:00
|
|
|
|
(unless (re-search-forward rx nil :noerror)
|
|
|
|
|
|
(user-error "Version not found in %s" file))
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(if (not (equal version (match-string 1)))
|
|
|
|
|
|
(replace-match version nil nil nil 1)
|
|
|
|
|
|
(kill-buffer)
|
|
|
|
|
|
(message "No need to update `%s'" file)))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
|
|
|
|
|
|
(defun set-version (root version)
|
|
|
|
|
|
"Set Emacs version to VERSION in relevant files under ROOT.
|
|
|
|
|
|
Root must be the root of an Emacs source tree."
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(interactive (list
|
|
|
|
|
|
(read-directory-name "Emacs root directory: " source-directory)
|
|
|
|
|
|
(read-string "Version number: "
|
|
|
|
|
|
(replace-regexp-in-string "\\.[0-9]+\\'" ""
|
|
|
|
|
|
emacs-version))))
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
|
2013-12-24 04:41:18 +00:00
|
|
|
|
(user-error "%s doesn't seem to be the root of an Emacs source tree" root))
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(message "Setting version numbers...")
|
2013-12-25 02:18:43 +00:00
|
|
|
|
;; There's also a "version 3" (standing for GPLv3) at the end of
|
|
|
|
|
|
;; `README', but since `set-version-in-file' only replaces the first
|
2014-01-13 22:21:32 +00:00
|
|
|
|
;; occurrence, it won't be replaced.
|
2001-10-19 16:33:45 +00:00
|
|
|
|
(set-version-in-file root "README" version
|
|
|
|
|
|
(rx (and "version" (1+ space)
|
|
|
|
|
|
(submatch (1+ (in "0-9."))))))
|
2012-07-09 04:52:49 +00:00
|
|
|
|
(set-version-in-file root "configure.ac" version
|
2007-12-05 03:32:13 +00:00
|
|
|
|
(rx (and "AC_INIT" (1+ (not (in ?,)))
|
|
|
|
|
|
?, (0+ space)
|
|
|
|
|
|
(submatch (1+ (in "0-9."))))))
|
2014-11-22 22:04:32 +00:00
|
|
|
|
;; TODO: msdos could easily extract the version number from
|
|
|
|
|
|
;; configure.ac with sed, rather than duplicating the information.
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 15:57:35 +00:00
|
|
|
|
(set-version-in-file root "msdos/sed2v2.inp" version
|
|
|
|
|
|
(rx (and bol "/^#undef " (1+ not-newline)
|
2011-09-26 03:02:21 +00:00
|
|
|
|
"define VERSION" (1+ space) "\""
|
Initial version of fix for the MS-DOS build, not yet tested.
config.bat: Configure in `lib'.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
src/s/msdos.h (strtold): Define to _strtold.
admin/admin.el (set-version): Add msdos/sed2v2.inp.
2011-02-19 15:57:35 +00:00
|
|
|
|
(submatch (1+ (in "0-9."))))))
|
2014-11-22 22:57:39 +00:00
|
|
|
|
;; 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"))
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(message "Setting version numbers...done"))
|
2003-01-17 14:48:15 +00:00
|
|
|
|
|
2007-06-07 07:28:32 +00:00
|
|
|
|
;; Note this makes some assumptions about form of short copyright.
|
|
|
|
|
|
(defun set-copyright (root copyright)
|
|
|
|
|
|
"Set Emacs short copyright to COPYRIGHT in relevant files under ROOT.
|
|
|
|
|
|
Root must be the root of an Emacs source tree."
|
|
|
|
|
|
(interactive (list
|
|
|
|
|
|
(read-directory-name "Emacs root directory: " nil nil t)
|
|
|
|
|
|
(read-string
|
|
|
|
|
|
"Short copyright string: "
|
|
|
|
|
|
(format "Copyright (C) %s Free Software Foundation, Inc."
|
|
|
|
|
|
(format-time-string "%Y")))))
|
|
|
|
|
|
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
|
2013-12-24 04:41:18 +00:00
|
|
|
|
(user-error "%s doesn't seem to be the root of an Emacs source tree" root))
|
2014-05-10 21:59:05 +00:00
|
|
|
|
(message "Setting copyrights...")
|
2012-09-17 00:56:08 +00:00
|
|
|
|
(set-version-in-file root "configure.ac" copyright
|
|
|
|
|
|
(rx (and bol "copyright" (0+ (not (in ?\")))
|
2011-01-03 00:35:01 +00:00
|
|
|
|
?\" (submatch (1+ (not (in ?\")))) ?\")))
|
2012-11-03 19:19:05 +00:00
|
|
|
|
(set-version-in-file root "msdos/sed2v2.inp" copyright
|
|
|
|
|
|
(rx (and bol "/^#undef " (1+ not-newline)
|
|
|
|
|
|
"define COPYRIGHT" (1+ space)
|
|
|
|
|
|
?\" (submatch (1+ (not (in ?\")))) ?\")))
|
2007-06-07 07:28:32 +00:00
|
|
|
|
(set-version-in-file root "lib-src/rcs2log" copyright
|
2011-01-03 00:35:01 +00:00
|
|
|
|
(rx (and "Copyright" (0+ space) ?= (0+ space)
|
|
|
|
|
|
?\' (submatch (1+ nonl)))))
|
|
|
|
|
|
(when (string-match "\\([0-9]\\{4\\}\\)" copyright)
|
|
|
|
|
|
(setq copyright (match-string 1 copyright))
|
Reduce version number duplication in etc/refcards
* etc/refcards/emacsver.tex: New file.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* refcards/emacsver.tex, etc/refcards/fr-dired-ref.tex:
* etc/refcards/fr-refcard.tex, etc/refcards/fr-survival.tex:
* etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex:
* etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: Include emacsver.tex.
* refcards/calccard.tex (\emacsversionnumber):
Rename to \versionemacs, same as all the other refcards.
* etc/refcards/Makefile (ENVADD): New variable.
(sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
(%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands.
* admin/admin.el (set-version): Set major version in
etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
(set-copyright): In etc/refcards, only change ru-refcard.tex
and emacsver.tex.
* admin.el (cusver-scan, cusver-check): Bind local variables.
* .bzrignore: Add etc/refcards TeX intermediate files.
2012-09-17 07:22:17 +00:00
|
|
|
|
(set-version-in-file root "etc/refcards/ru-refcard.tex" copyright
|
|
|
|
|
|
"\\\\newcommand{\\\\cyear}\\[0\\]\
|
|
|
|
|
|
{\\([0-9]\\{4\\}\\)}.+%.+copyright year")
|
2014-11-10 00:57:01 +00:00
|
|
|
|
(set-version-in-file root "etc/refcards/emacsver.tex.in" copyright
|
Reduce version number duplication in etc/refcards
* etc/refcards/emacsver.tex: New file.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* refcards/emacsver.tex, etc/refcards/fr-dired-ref.tex:
* etc/refcards/fr-refcard.tex, etc/refcards/fr-survival.tex:
* etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex:
* etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: Include emacsver.tex.
* refcards/calccard.tex (\emacsversionnumber):
Rename to \versionemacs, same as all the other refcards.
* etc/refcards/Makefile (ENVADD): New variable.
(sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
(%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands.
* admin/admin.el (set-version): Set major version in
etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
(set-copyright): In etc/refcards, only change ru-refcard.tex
and emacsver.tex.
* admin.el (cusver-scan, cusver-check): Bind local variables.
* .bzrignore: Add etc/refcards TeX intermediate files.
2012-09-17 07:22:17 +00:00
|
|
|
|
"\\\\def\\\\year\
|
2014-05-10 21:59:05 +00:00
|
|
|
|
{\\([0-9]\\{4\\}\\)}.+%.+copyright year"))
|
|
|
|
|
|
(message "Setting copyrights...done"))
|
2007-06-07 07:28:32 +00:00
|
|
|
|
|
2011-03-13 03:50:33 +00:00
|
|
|
|
;;; Various bits of magic for generating the web manuals
|
|
|
|
|
|
|
2013-07-06 02:32:13 +00:00
|
|
|
|
(defun manual-misc-manuals (root)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Return doc/misc manuals as list of strings.
|
|
|
|
|
|
ROOT should be the root of an Emacs source tree."
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
|
;; Similar to `make -C doc/misc echo-info', but works if unconfigured,
|
|
|
|
|
|
;; and for INFO_TARGETS rather than INFO_INSTALL.
|
2013-07-06 02:32:13 +00:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name "doc/misc/Makefile.in" root))
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
|
;; Should really use expanded value of INFO_TARGETS.
|
|
|
|
|
|
(search-forward "INFO_COMMON = ")
|
|
|
|
|
|
(let ((start (point)))
|
2013-07-06 02:32:13 +00:00
|
|
|
|
(end-of-line)
|
|
|
|
|
|
(while (and (looking-back "\\\\")
|
|
|
|
|
|
(zerop (forward-line 1)))
|
|
|
|
|
|
(end-of-line))
|
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.
* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.
* doc/misc/efaq-w32.texi: Move here from the web-pages repository.
* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.
2013-08-27 07:57:39 +00:00
|
|
|
|
(append (split-string (replace-regexp-in-string
|
|
|
|
|
|
"\\(\\\\\\|\\.info\\)" ""
|
|
|
|
|
|
(buffer-substring start (point))))
|
|
|
|
|
|
'("efaq-w32")))))
|
2013-07-06 02:32:13 +00:00
|
|
|
|
|
2014-01-02 08:47:40 +00:00
|
|
|
|
;; TODO report the progress
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(defun make-manuals (root &optional type)
|
|
|
|
|
|
"Generate the web manuals for the Emacs webpage.
|
2013-12-27 10:21:47 +00:00
|
|
|
|
ROOT should be the root of an Emacs source tree.
|
2013-07-06 18:28:54 +00:00
|
|
|
|
Interactively with a prefix argument, prompt for TYPE.
|
|
|
|
|
|
Optional argument TYPE is type of output (nil means all)."
|
|
|
|
|
|
(interactive (let ((root (read-directory-name "Emacs root directory: "
|
|
|
|
|
|
source-directory nil t)))
|
|
|
|
|
|
(list root
|
|
|
|
|
|
(if current-prefix-arg
|
|
|
|
|
|
(completing-read
|
|
|
|
|
|
"Type: "
|
|
|
|
|
|
(append
|
|
|
|
|
|
'("misc" "pdf" "ps")
|
|
|
|
|
|
(let (res)
|
|
|
|
|
|
(dolist (i '("emacs" "elisp" "eintr") res)
|
|
|
|
|
|
(dolist (j '("" "-mono" "-node" "-ps" "-pdf"))
|
|
|
|
|
|
(push (concat i j) res))))
|
|
|
|
|
|
(manual-misc-manuals root)))))))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(let* ((dest (expand-file-name "manual" root))
|
|
|
|
|
|
(html-node-dir (expand-file-name "html_node" dest))
|
|
|
|
|
|
(html-mono-dir (expand-file-name "html_mono" dest))
|
2013-07-05 16:10:47 +00:00
|
|
|
|
(ps-dir (expand-file-name "ps" dest))
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(pdf-dir (expand-file-name "pdf" dest))
|
|
|
|
|
|
(emacs (expand-file-name "doc/emacs/emacs.texi" root))
|
2015-04-18 21:30:32 +00:00
|
|
|
|
(emacs-xtra (expand-file-name "doc/emacs/emacs-xtra.texi" root))
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(elisp (expand-file-name "doc/lispref/elisp.texi" root))
|
|
|
|
|
|
(eintr (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
|
|
|
|
|
|
(misc (manual-misc-manuals root)))
|
|
|
|
|
|
;; TODO this makes it non-continuable.
|
|
|
|
|
|
;; Instead, delete the individual dest directory each time.
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(when (file-directory-p dest)
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(if (y-or-n-p (format "Directory %s exists, delete it first? " dest))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(delete-directory dest t)
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(user-error "Aborted")))
|
|
|
|
|
|
(if (member type '(nil "emacs" "emacs-node"))
|
|
|
|
|
|
(manual-html-node emacs (expand-file-name "emacs" html-node-dir)))
|
|
|
|
|
|
(if (member type '(nil "emacs" "emacs-mono"))
|
|
|
|
|
|
(manual-html-mono emacs (expand-file-name "emacs.html" html-mono-dir)))
|
2015-04-18 21:30:32 +00:00
|
|
|
|
(when (member type '(nil "emacs" "emacs-pdf" "pdf"))
|
|
|
|
|
|
(manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir))
|
|
|
|
|
|
;; emacs-xtra exists only in pdf/ps format.
|
|
|
|
|
|
;; In other formats it is included in the Emacs manual.
|
|
|
|
|
|
(manual-pdf emacs-xtra (expand-file-name "emacs-xtra.pdf" pdf-dir)))
|
|
|
|
|
|
(when (member type '(nil "emacs" "emacs-ps" "ps"))
|
|
|
|
|
|
(manual-ps emacs (expand-file-name "emacs.ps" ps-dir))
|
|
|
|
|
|
(manual-ps emacs-xtra (expand-file-name "emacs-xtra.ps" ps-dir)))
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(if (member type '(nil "elisp" "elisp-node"))
|
|
|
|
|
|
(manual-html-node elisp (expand-file-name "elisp" html-node-dir)))
|
|
|
|
|
|
(if (member type '(nil "elisp" "elisp-mono"))
|
|
|
|
|
|
(manual-html-mono elisp (expand-file-name "elisp.html" html-mono-dir)))
|
|
|
|
|
|
(if (member type '(nil "elisp" "elisp-pdf" "pdf"))
|
|
|
|
|
|
(manual-pdf elisp (expand-file-name "elisp.pdf" pdf-dir)))
|
|
|
|
|
|
(if (member type '(nil "elisp" "elisp-ps" "ps"))
|
|
|
|
|
|
(manual-ps elisp (expand-file-name "elisp.ps" ps-dir)))
|
|
|
|
|
|
(if (member type '(nil "eintr" "eintr-node"))
|
|
|
|
|
|
(manual-html-node eintr (expand-file-name "eintr" html-node-dir)))
|
|
|
|
|
|
(if (member type '(nil "eintr" "eintr-node"))
|
|
|
|
|
|
(manual-html-mono eintr (expand-file-name "eintr.html" html-mono-dir)))
|
|
|
|
|
|
(if (member type '(nil "eintr" "eintr-pdf" "pdf"))
|
|
|
|
|
|
(manual-pdf eintr (expand-file-name "eintr.pdf" pdf-dir)))
|
|
|
|
|
|
(if (member type '(nil "eintr" "eintr-ps" "ps"))
|
|
|
|
|
|
(manual-ps eintr (expand-file-name "eintr.ps" ps-dir)))
|
2012-06-10 09:06:34 +00:00
|
|
|
|
;; Misc manuals
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(dolist (manual misc)
|
|
|
|
|
|
(if (member type `(nil ,manual "misc"))
|
|
|
|
|
|
(manual-misc-html manual root html-node-dir html-mono-dir)))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(message "Manuals created in %s" dest)))
|
|
|
|
|
|
|
|
|
|
|
|
(defconst manual-doctype-string
|
|
|
|
|
|
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"
|
|
|
|
|
|
\"http://www.w3.org/TR/html4/loose.dtd\">\n\n")
|
|
|
|
|
|
|
|
|
|
|
|
(defconst manual-meta-string
|
|
|
|
|
|
"<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">
|
2015-02-02 00:55:24 +00:00
|
|
|
|
<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
|
2011-03-13 03:50:33 +00:00
|
|
|
|
<link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\">
|
|
|
|
|
|
<meta name=\"ICBM\" content=\"42.256233,-71.006581\">
|
|
|
|
|
|
<meta name=\"DC.title\" content=\"gnu.org\">\n\n")
|
|
|
|
|
|
|
|
|
|
|
|
(defconst manual-style-string "<style type=\"text/css\">
|
2013-07-12 06:45:04 +00:00
|
|
|
|
@import url('/software/emacs/manual.css');\n</style>\n")
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(defun manual-misc-html (name root html-node-dir html-mono-dir)
|
2013-07-06 18:28:54 +00:00
|
|
|
|
;; Hack to deal with the cases where .texi creates a different .info.
|
2013-08-27 17:19:04 +00:00
|
|
|
|
;; Blech. TODO Why not just rename the .texi (or .info) files?
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(let* ((texiname (cond ((equal name "ccmode") "cc-mode")
|
|
|
|
|
|
(t name)))
|
|
|
|
|
|
(texi (expand-file-name (format "doc/misc/%s.texi" texiname) root)))
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(manual-html-node texi (expand-file-name name html-node-dir))
|
|
|
|
|
|
(manual-html-mono texi (expand-file-name (concat name ".html")
|
|
|
|
|
|
html-mono-dir))))
|
|
|
|
|
|
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(defun manual-html-mono (texi-file dest)
|
|
|
|
|
|
"Run Makeinfo on TEXI-FILE, emitting mono HTML output to DEST.
|
|
|
|
|
|
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."
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(make-directory (or (file-name-directory dest) ".") t)
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(call-process "makeinfo" nil nil nil
|
2013-03-12 07:15:15 +00:00
|
|
|
|
"-D" "WWW_GNU_ORG"
|
2013-03-11 08:09:21 +00:00
|
|
|
|
"-I" (expand-file-name "../emacs"
|
|
|
|
|
|
(file-name-directory texi-file))
|
|
|
|
|
|
"-I" (expand-file-name "../misc"
|
|
|
|
|
|
(file-name-directory texi-file))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
"--html" "--no-split" texi-file "-o" dest)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents dest)
|
|
|
|
|
|
(setq buffer-file-name dest)
|
|
|
|
|
|
(manual-html-fix-headers)
|
|
|
|
|
|
(manual-html-fix-index-1)
|
|
|
|
|
|
(manual-html-fix-index-2 t)
|
|
|
|
|
|
(manual-html-fix-node-div)
|
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
|
(re-search-backward "</body>[\n \t]*</html>")
|
2014-01-03 03:24:27 +00:00
|
|
|
|
;; Close the div id="content" that fix-index-1 added.
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(insert "</div>\n\n")
|
|
|
|
|
|
(save-buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun manual-html-node (texi-file dir)
|
|
|
|
|
|
"Run Makeinfo on TEXI-FILE, emitting per-node HTML output to DIR.
|
|
|
|
|
|
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."
|
|
|
|
|
|
(unless (file-exists-p texi-file)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(user-error "Manual file %s not found" texi-file))
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(make-directory dir t)
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(call-process "makeinfo" nil nil nil
|
2013-03-12 07:15:15 +00:00
|
|
|
|
"-D" "WWW_GNU_ORG"
|
2013-03-11 08:09:21 +00:00
|
|
|
|
"-I" (expand-file-name "../emacs"
|
|
|
|
|
|
(file-name-directory texi-file))
|
|
|
|
|
|
"-I" (expand-file-name "../misc"
|
|
|
|
|
|
(file-name-directory texi-file))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
"--html" texi-file "-o" dir)
|
|
|
|
|
|
;; Loop through the node files, fixing them up.
|
|
|
|
|
|
(dolist (f (directory-files dir nil "\\.html\\'"))
|
|
|
|
|
|
(let (opoint)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents (expand-file-name f dir))
|
|
|
|
|
|
(setq buffer-file-name (expand-file-name f dir))
|
|
|
|
|
|
(if (looking-at "<meta http-equiv")
|
|
|
|
|
|
;; Ignore those HTML files that are just redirects.
|
|
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
|
|
(manual-html-fix-headers)
|
|
|
|
|
|
(if (equal f "index.html")
|
|
|
|
|
|
(let (copyright-text)
|
|
|
|
|
|
(manual-html-fix-index-1)
|
|
|
|
|
|
;; Move copyright notice to the end.
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(when (re-search-forward "[ \t]*<p>Copyright ©" nil t)
|
|
|
|
|
|
(setq opoint (match-beginning 0))
|
|
|
|
|
|
(re-search-forward "</blockquote>")
|
|
|
|
|
|
(setq copyright-text (buffer-substring opoint (point)))
|
|
|
|
|
|
(delete-region opoint (point)))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(manual-html-fix-index-2)
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(if copyright-text
|
|
|
|
|
|
(insert copyright-text))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
;; Close the div id="content" that fix-index-1 added.
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(insert "\n</div>\n"))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
;; For normal nodes, give the header div a blue bg.
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(manual-html-fix-node-div t))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(save-buffer))))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun manual-pdf (texi-file dest)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Run texi2pdf on TEXI-FILE, emitting PDF output to DEST."
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(make-directory (or (file-name-directory dest) ".") t)
|
2013-06-29 02:54:37 +00:00
|
|
|
|
(let ((default-directory (file-name-directory texi-file)))
|
|
|
|
|
|
(call-process "texi2pdf" nil nil nil
|
|
|
|
|
|
"-I" "../emacs" "-I" "../misc"
|
|
|
|
|
|
texi-file "-o" dest)))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
2013-06-29 01:51:32 +00:00
|
|
|
|
(defun manual-ps (texi-file dest)
|
|
|
|
|
|
"Generate a PostScript version of TEXI-FILE as DEST."
|
2013-07-06 18:28:54 +00:00
|
|
|
|
(make-directory (or (file-name-directory dest) ".") t)
|
2013-06-29 02:54:37 +00:00
|
|
|
|
(let ((dvi-dest (concat (file-name-sans-extension dest) ".dvi"))
|
|
|
|
|
|
(default-directory (file-name-directory texi-file)))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
;; FIXME: Use `texi2dvi --ps'? --xfq
|
2013-06-29 01:51:32 +00:00
|
|
|
|
(call-process "texi2dvi" nil nil nil
|
2013-06-29 02:54:37 +00:00
|
|
|
|
"-I" "../emacs" "-I" "../misc"
|
2013-06-29 01:51:32 +00:00
|
|
|
|
texi-file "-o" dvi-dest)
|
|
|
|
|
|
(call-process "dvips" nil nil nil dvi-dest "-o" dest)
|
|
|
|
|
|
(delete-file dvi-dest)
|
|
|
|
|
|
(call-process "gzip" nil nil nil dest)))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
|
|
|
|
|
(defun manual-html-fix-headers ()
|
|
|
|
|
|
"Fix up HTML headers for the Emacs manual in the current buffer."
|
2013-12-30 18:58:16 +00:00
|
|
|
|
(let ((texi5 (search-forward "<!DOCTYPE" nil t))
|
|
|
|
|
|
opoint)
|
|
|
|
|
|
;; Texinfo 5 supplies a DOCTYPE.
|
|
|
|
|
|
(or texi5
|
|
|
|
|
|
(insert manual-doctype-string))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(search-forward "<head>\n")
|
|
|
|
|
|
(insert manual-meta-string)
|
|
|
|
|
|
(search-forward "<meta")
|
|
|
|
|
|
(setq opoint (match-beginning 0))
|
2013-12-30 18:58:16 +00:00
|
|
|
|
(unless texi5
|
|
|
|
|
|
(search-forward "<!--")
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
|
(delete-region opoint (point))
|
|
|
|
|
|
(search-forward "<meta http-equiv=\"Content-Style")
|
2013-12-30 18:58:16 +00:00
|
|
|
|
(setq opoint (match-beginning 0)))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(search-forward "</head>")
|
2013-12-30 18:58:16 +00:00
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
|
(delete-region opoint (point))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(insert manual-style-string)
|
|
|
|
|
|
;; Remove Texinfo 5 hard-coding bgcolor, text, link, vlink, alink.
|
|
|
|
|
|
(when (re-search-forward "<body lang=\"[^\"]+\"" nil t)
|
|
|
|
|
|
(setq opoint (point))
|
|
|
|
|
|
(search-forward ">")
|
|
|
|
|
|
(if (> (point) (1+ opoint))
|
|
|
|
|
|
(delete-region opoint (1- (point))))
|
|
|
|
|
|
(search-backward "</head"))))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
2014-01-03 03:24:27 +00:00
|
|
|
|
;; Texinfo 5 changed these from class = "node" to "header", yay.
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(defun manual-html-fix-node-div (&optional split)
|
2011-03-13 03:50:33 +00:00
|
|
|
|
"Fix up HTML \"node\" divs in the current buffer."
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(let (opoint div-end type)
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(while (re-search-forward "<div class=\"\\(node\\|header\\)\"\\(>\\)" nil t)
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(setq type (match-string 1))
|
|
|
|
|
|
;; NB it is this that makes the bg of non-header cells in the
|
|
|
|
|
|
;; index tables be blue. Is that intended?
|
|
|
|
|
|
;; Also, if you don't remove the <hr>, the color of the first
|
|
|
|
|
|
;; row in the table will be wrong.
|
|
|
|
|
|
;; This all seems rather odd to me...
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(replace-match " style=\"background-color:#DDDDFF\">" t t nil 2)
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(setq opoint (point))
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(when (or split (equal type "node"))
|
|
|
|
|
|
;; In Texinfo 4, the <hr> (and anchor) comes after the <div>.
|
|
|
|
|
|
(re-search-forward "</div>")
|
|
|
|
|
|
(setq div-end (if (equal type "node")
|
|
|
|
|
|
(match-beginning 0)
|
|
|
|
|
|
(line-end-position 2)))
|
|
|
|
|
|
(goto-char opoint)
|
|
|
|
|
|
(if (search-forward "<hr>" div-end 'move)
|
|
|
|
|
|
(replace-match "" t t)
|
|
|
|
|
|
(if split (forward-line -1))))
|
|
|
|
|
|
;; In Texinfo 5, the <hr> (and anchor) comes before the <div> (?).
|
|
|
|
|
|
;; Except in split output, where it comes on the line after
|
|
|
|
|
|
;; the <div>. But only sometimes. I have no clue what the
|
|
|
|
|
|
;; logic of where it goes is.
|
|
|
|
|
|
(when (equal type "header")
|
|
|
|
|
|
(goto-char opoint)
|
|
|
|
|
|
(when (re-search-backward "^<hr>$" (line-beginning-position -3) t)
|
|
|
|
|
|
(replace-match "")
|
|
|
|
|
|
(goto-char opoint))))))
|
|
|
|
|
|
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
|
|
|
|
|
(defun manual-html-fix-index-1 ()
|
2014-01-03 03:24:27 +00:00
|
|
|
|
"Remove the h1 header, and the short and long contents lists.
|
|
|
|
|
|
Also start a \"content\" div."
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(let (opoint)
|
2013-12-30 18:58:16 +00:00
|
|
|
|
(re-search-forward "<body.*>\n")
|
2012-06-10 09:06:34 +00:00
|
|
|
|
(setq opoint (match-end 0))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
;; FIXME? Fragile if a Texinfo 5 document does not use @top.
|
|
|
|
|
|
(or (re-search-forward "<h1 class=\"top\"" nil t) ; Texinfo 5
|
|
|
|
|
|
(search-forward "<h2 class=\""))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
|
(delete-region opoint (point))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
;; NB caller must close this div.
|
2011-03-13 03:50:33 +00:00
|
|
|
|
(insert "<div id=\"content\" class=\"inner\">\n\n")))
|
|
|
|
|
|
|
|
|
|
|
|
(defun manual-html-fix-index-2 (&optional table-workaround)
|
2014-01-04 02:31:56 +00:00
|
|
|
|
"Replace the index list in the current buffer with a HTML table.
|
|
|
|
|
|
Leave point after the table."
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(if (re-search-forward "<table class=\"menu\"\\(.*\\)>" nil t)
|
2014-01-04 02:31:56 +00:00
|
|
|
|
;; Texinfo 5 already uses a table. Tweak it a bit.
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(let (opoint done)
|
|
|
|
|
|
(replace-match " style=\"float:left\" width=\"100%\"" nil t nil 1)
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(while (not done)
|
|
|
|
|
|
(cond ((re-search-forward "<tr><td.*• \\(<a.*</a>\\)\
|
2014-01-04 02:35:45 +00:00
|
|
|
|
:</td><td> </td><td[^>]*>\\(.*\\)" (line-end-position) t)
|
2014-01-04 02:31:56 +00:00
|
|
|
|
(replace-match (format "<tr><td%s>\\1</td>\n<td>\\2"
|
|
|
|
|
|
(if table-workaround
|
|
|
|
|
|
" bgcolor=\"white\"" "")))
|
|
|
|
|
|
(search-forward "</td></tr>")
|
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
|
((looking-at "<tr><th.*<pre class=\"menu-comment\">\n")
|
|
|
|
|
|
(replace-match "<tr><th colspan=\"2\" align=\"left\" \
|
|
|
|
|
|
style=\"text-align:left\">")
|
|
|
|
|
|
(search-forward "</pre></th></tr>")
|
|
|
|
|
|
(replace-match "</th></tr>\n"))
|
|
|
|
|
|
;; Not all manuals have the detailed menu.
|
|
|
|
|
|
;; If it is there, split it into a separate table.
|
|
|
|
|
|
((re-search-forward "<tr>.*The Detailed Node Listing *"
|
|
|
|
|
|
(line-end-position) t)
|
|
|
|
|
|
(setq opoint (match-beginning 0))
|
|
|
|
|
|
(while (and (looking-at " *—")
|
|
|
|
|
|
(zerop (forward-line 1))))
|
|
|
|
|
|
(delete-region opoint (point))
|
|
|
|
|
|
(insert "</table>\n\n\
|
|
|
|
|
|
<h2>Detailed Node Listing</h2>\n\n<p>")
|
|
|
|
|
|
;; FIXME Fragile!
|
|
|
|
|
|
;; The Emacs and Elisp manual have some text at the
|
|
|
|
|
|
;; start of the detailed menu that is not part of the menu.
|
|
|
|
|
|
;; Other manuals do not.
|
|
|
|
|
|
(if (re-search-forward "in one step:" (line-end-position 3) t)
|
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
|
(insert "</p>\n")
|
|
|
|
|
|
(search-forward "</pre></th></tr>")
|
|
|
|
|
|
(delete-region (match-beginning 0) (match-end 0))
|
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
|
(or (looking-at "^$") (error "Parse error 1"))
|
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
|
(if (looking-at "^$") (error "Parse error 2"))
|
|
|
|
|
|
(forward-line -1)
|
|
|
|
|
|
(or (looking-at "^$") (error "Parse error 3"))
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(insert "<table class=\"menu\" style=\"float:left\" width=\"100%\">\n\
|
|
|
|
|
|
<tr><th colspan=\"2\" align=\"left\" style=\"text-align:left\">\n")
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(insert "</th></tr>")
|
|
|
|
|
|
(forward-line 1))
|
|
|
|
|
|
((looking-at ".*</table")
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(setq done t)))))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(let (done open-td tag desc)
|
|
|
|
|
|
;; Convert the list that Makeinfo made into a table.
|
|
|
|
|
|
(or (search-forward "<ul class=\"menu\">" nil t)
|
|
|
|
|
|
;; FIXME? The following search seems dangerously lax.
|
|
|
|
|
|
(search-forward "<ul>"))
|
|
|
|
|
|
(replace-match "<table style=\"float:left\" width=\"100%\">")
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(while (not done)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((or (looking-at "<li>\\(<a.+</a>\\):[ \t]+\\(.*\\)$")
|
|
|
|
|
|
(looking-at "<li>\\(<a.+</a>\\)$"))
|
|
|
|
|
|
(setq tag (match-string 1))
|
|
|
|
|
|
(setq desc (match-string 2))
|
|
|
|
|
|
(replace-match "" t t)
|
|
|
|
|
|
(when open-td
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(forward-char -1)
|
|
|
|
|
|
(skip-chars-backward " ")
|
|
|
|
|
|
(delete-region (point) (line-end-position))
|
|
|
|
|
|
(insert "</td>\n </tr>")))
|
|
|
|
|
|
(insert " <tr>\n ")
|
|
|
|
|
|
(if table-workaround
|
|
|
|
|
|
;; This works around a Firefox bug in the mono file.
|
|
|
|
|
|
(insert "<td bgcolor=\"white\">")
|
|
|
|
|
|
(insert "<td>"))
|
|
|
|
|
|
(insert tag "</td>\n <td>" (or desc ""))
|
|
|
|
|
|
(setq open-td t))
|
|
|
|
|
|
((eq (char-after) ?\n)
|
|
|
|
|
|
(delete-char 1)
|
|
|
|
|
|
;; Negate the following `forward-line'.
|
|
|
|
|
|
(forward-line -1))
|
|
|
|
|
|
((looking-at "<!-- ")
|
|
|
|
|
|
(search-forward "-->"))
|
|
|
|
|
|
((looking-at "<p>[- ]*The Detailed Node Listing[- \n]*")
|
|
|
|
|
|
(replace-match " </td></tr></table>\n
|
2011-03-13 03:50:33 +00:00
|
|
|
|
<h3>Detailed Node Listing</h3>\n\n" t t)
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(search-forward "<p>")
|
2014-01-04 03:18:33 +00:00
|
|
|
|
;; FIXME Fragile!
|
|
|
|
|
|
;; The Emacs and Elisp manual have some text at the
|
|
|
|
|
|
;; start of the detailed menu that is not part of the menu.
|
|
|
|
|
|
;; Other manuals do not.
|
|
|
|
|
|
(if (looking-at "Here are some other nodes")
|
|
|
|
|
|
(search-forward "<p>"))
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(goto-char (match-beginning 0))
|
|
|
|
|
|
(skip-chars-backward "\n ")
|
|
|
|
|
|
(setq open-td nil)
|
|
|
|
|
|
(insert "</p>\n\n<table style=\"float:left\" width=\"100%\">"))
|
|
|
|
|
|
((looking-at "</li></ul>")
|
|
|
|
|
|
(replace-match "" t t))
|
|
|
|
|
|
((looking-at "<p>")
|
|
|
|
|
|
(replace-match "" t t)
|
|
|
|
|
|
(when open-td
|
|
|
|
|
|
(insert " </td></tr>")
|
|
|
|
|
|
(setq open-td nil))
|
|
|
|
|
|
(insert " <tr>
|
2011-03-13 03:50:33 +00:00
|
|
|
|
<th colspan=\"2\" align=\"left\" style=\"text-align:left\">")
|
2014-01-03 03:24:27 +00:00
|
|
|
|
(if (re-search-forward "</p>[ \t\n]*<ul class=\"menu\">" nil t)
|
|
|
|
|
|
(replace-match " </th></tr>")))
|
|
|
|
|
|
((looking-at "[ \t]*</ul>[ \t]*$")
|
|
|
|
|
|
(replace-match
|
|
|
|
|
|
(if open-td
|
|
|
|
|
|
" </td></tr>\n</table>"
|
|
|
|
|
|
"</table>") t t)
|
|
|
|
|
|
(setq done t))
|
|
|
|
|
|
(t
|
|
|
|
|
|
(if (eobp)
|
|
|
|
|
|
(error "Parse error in %s"
|
|
|
|
|
|
(file-name-nondirectory buffer-file-name)))
|
|
|
|
|
|
(unless open-td
|
|
|
|
|
|
(setq done t))))
|
|
|
|
|
|
(forward-line 1)))))
|
2011-03-13 03:50:33 +00:00
|
|
|
|
|
2014-11-09 02:02:51 +00:00
|
|
|
|
|
|
|
|
|
|
(defconst make-manuals-dist-output-variables
|
2014-11-10 00:17:17 +00:00
|
|
|
|
`(("@\\(top_\\)?srcdir@" . ".") ; top_srcdir is wrong, but not used
|
2014-11-09 02:02:51 +00:00
|
|
|
|
("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
|
|
|
|
|
|
("^\\(clean:.*\\)" . "\\1 infoclean")
|
|
|
|
|
|
("@MAKEINFO@" . "makeinfo")
|
|
|
|
|
|
("@MKDIR_P@" . "mkdir -p")
|
|
|
|
|
|
("@INFO_EXT@" . ".info")
|
|
|
|
|
|
("@INFO_OPTS@" . "")
|
|
|
|
|
|
("@SHELL@" . "/bin/bash")
|
|
|
|
|
|
("@prefix@" . "/usr/local")
|
|
|
|
|
|
("@datarootdir@" . "${prefix}/share")
|
|
|
|
|
|
("@datadir@" . "${datarootdir}")
|
|
|
|
|
|
("@PACKAGE_TARNAME@" . "emacs")
|
|
|
|
|
|
("@docdir@" . "${datarootdir}/doc/${PACKAGE_TARNAME}")
|
|
|
|
|
|
("@\\(dvi\\|html\\|pdf\\|ps\\)dir@" . "${docdir}")
|
|
|
|
|
|
("@GZIP_PROG@" . "gzip")
|
|
|
|
|
|
("@INSTALL@" . "install -c")
|
|
|
|
|
|
("@INSTALL_DATA@" . "${INSTALL} -m 644")
|
|
|
|
|
|
("@configure_input@" . ""))
|
|
|
|
|
|
"Alist of (REGEXP . REPLACEMENT) pairs for `make-manuals-dist'.")
|
|
|
|
|
|
|
|
|
|
|
|
(defun make-manuals-dist--1 (root type)
|
|
|
|
|
|
"Subroutine of `make-manuals-dist'."
|
|
|
|
|
|
(let* ((dest (expand-file-name "manual" root))
|
|
|
|
|
|
(default-directory (progn (make-directory dest t)
|
|
|
|
|
|
(file-name-as-directory dest)))
|
|
|
|
|
|
(version (with-temp-buffer
|
|
|
|
|
|
(insert-file-contents "../doc/emacs/emacsver.texi")
|
|
|
|
|
|
(re-search-forward "@set EMACSVER \\([0-9.]+\\)")
|
|
|
|
|
|
(match-string 1)))
|
|
|
|
|
|
(stem (format "emacs-%s-%s" (if (equal type "emacs") "manual" type)
|
|
|
|
|
|
version))
|
|
|
|
|
|
(tarfile (format "%s.tar" stem)))
|
|
|
|
|
|
(message "Doing %s..." type)
|
|
|
|
|
|
(if (file-directory-p stem)
|
|
|
|
|
|
(delete-directory stem t))
|
|
|
|
|
|
(make-directory stem)
|
|
|
|
|
|
(copy-file "../doc/misc/texinfo.tex" stem)
|
|
|
|
|
|
(or (equal type "emacs") (copy-file "../doc/emacs/emacsver.texi" stem))
|
|
|
|
|
|
(dolist (file (directory-files (format "../doc/%s" type) t))
|
2015-04-07 07:00:55 +00:00
|
|
|
|
(if (or (string-match-p "\\(\\.texi\\'\\|/README\\'\\)" file)
|
2014-11-09 02:02:51 +00:00
|
|
|
|
(and (equal type "lispintro")
|
|
|
|
|
|
(string-match-p "\\.\\(eps\\|pdf\\)\\'" file)))
|
|
|
|
|
|
(copy-file file stem)))
|
|
|
|
|
|
(with-temp-buffer
|
2014-11-10 00:17:17 +00:00
|
|
|
|
(let ((outvars make-manuals-dist-output-variables))
|
|
|
|
|
|
(push `("@version@" . ,version) outvars)
|
|
|
|
|
|
(insert-file-contents (format "../doc/%s/Makefile.in" type))
|
|
|
|
|
|
(dolist (cons outvars)
|
|
|
|
|
|
(while (re-search-forward (car cons) nil t)
|
|
|
|
|
|
(replace-match (cdr cons) t))
|
|
|
|
|
|
(goto-char (point-min))))
|
2014-11-09 02:02:51 +00:00
|
|
|
|
(let (ats)
|
|
|
|
|
|
(while (re-search-forward "@[a-zA-Z_]+@" nil t)
|
|
|
|
|
|
(setq ats t)
|
|
|
|
|
|
(message "Unexpanded: %s" (match-string 0)))
|
|
|
|
|
|
(if ats (error "Unexpanded configure variables in Makefile?")))
|
|
|
|
|
|
(write-region nil nil (expand-file-name (format "%s/Makefile" stem))
|
|
|
|
|
|
nil 'silent))
|
|
|
|
|
|
(call-process "tar" nil nil nil "-cf" tarfile stem)
|
|
|
|
|
|
(delete-directory stem t)
|
|
|
|
|
|
(message "...created %s" tarfile)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Does anyone actually use these tarfiles?
|
|
|
|
|
|
(defun make-manuals-dist (root &optional type)
|
|
|
|
|
|
"Make the standalone manual source tarfiles for the Emacs webpage.
|
|
|
|
|
|
ROOT should be the root of an Emacs source tree.
|
|
|
|
|
|
Interactively with a prefix argument, prompt for TYPE.
|
|
|
|
|
|
Optional argument TYPE is type of output (nil means all)."
|
|
|
|
|
|
(interactive (let ((root (read-directory-name "Emacs root directory: "
|
|
|
|
|
|
source-directory nil t)))
|
|
|
|
|
|
(list root
|
|
|
|
|
|
(if current-prefix-arg
|
|
|
|
|
|
(completing-read
|
|
|
|
|
|
"Type: "
|
|
|
|
|
|
'("emacs" "lispref" "lispintro" "misc"))))))
|
|
|
|
|
|
(unless (file-exists-p (expand-file-name "src/emacs.c" root))
|
|
|
|
|
|
(user-error "%s doesn't seem to be the root of an Emacs source tree" root))
|
|
|
|
|
|
(dolist (m '("emacs" "lispref" "lispintro" "misc"))
|
|
|
|
|
|
(if (member type (list nil m))
|
|
|
|
|
|
(make-manuals-dist--1 root m))))
|
|
|
|
|
|
|
2012-02-11 22:16:10 +00:00
|
|
|
|
|
2013-12-27 10:21:47 +00:00
|
|
|
|
;; Stuff to check new `defcustom's got :version tags.
|
2012-02-11 22:16:10 +00:00
|
|
|
|
;; Adapted from check-declare.el.
|
|
|
|
|
|
|
|
|
|
|
|
(defun cusver-find-files (root &optional old)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Find .el files beneath directory ROOT that contain `defcustom's.
|
|
|
|
|
|
If optional OLD is non-nil, also include `defvar's."
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(process-lines find-program root
|
|
|
|
|
|
"-name" "*.el"
|
|
|
|
|
|
"-exec" grep-program
|
|
|
|
|
|
"-l" "-E" (format "^[ \\t]*\\(def%s"
|
|
|
|
|
|
(if old "(custom|var)"
|
|
|
|
|
|
"custom"
|
|
|
|
|
|
))
|
|
|
|
|
|
"{}" "+"))
|
|
|
|
|
|
|
2012-10-07 00:54:36 +00:00
|
|
|
|
(defvar cusver-new-version (format "%s.%s" emacs-major-version
|
|
|
|
|
|
(1+ emacs-minor-version))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Version number that new `defcustom's should have.")
|
2012-10-06 21:15:03 +00:00
|
|
|
|
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(defun cusver-scan (file &optional old)
|
|
|
|
|
|
"Scan FILE for `defcustom' calls.
|
|
|
|
|
|
Return a list with elements of the form (VAR . VER),
|
|
|
|
|
|
This means that FILE contains a defcustom for variable VAR, with
|
|
|
|
|
|
a :version tag having value VER (may be nil).
|
2013-12-27 10:21:47 +00:00
|
|
|
|
If optional argument OLD is non-nil, also scan for `defvar's."
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(let ((m (format "Scanning %s..." file))
|
|
|
|
|
|
(re (format "^[ \t]*\\((def%s\\)[ \t\n]"
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(if old "\\(custom\\|var\\)" "\\(custom\\|group\\)")))
|
|
|
|
|
|
alist var ver form glist grp)
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(message "%s" m)
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(insert-file-contents file)
|
|
|
|
|
|
;; FIXME we could theoretically be inside a string.
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(while (re-search-forward re nil :noerror)
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
|
|
(if (and (setq form (ignore-errors (read (current-buffer))))
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(setq var (car-safe (cdr-safe form)))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
;; Exclude macros, eg (defcustom ,varname ...).
|
|
|
|
|
|
(symbolp var))
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(progn
|
2013-12-28 08:33:44 +00:00
|
|
|
|
;; FIXME It should be cus-test-apropos that does this.
|
|
|
|
|
|
(and (not old)
|
|
|
|
|
|
(equal "custom" (match-string 2))
|
|
|
|
|
|
(not (memq :type form))
|
2015-08-27 09:24:48 +00:00
|
|
|
|
(display-warning
|
|
|
|
|
|
'custom (format-message "Missing type in: `%s'" form)))
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(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))))
|
2015-08-27 09:24:48 +00:00
|
|
|
|
(if form (format-message "Malformed defcustom: `%s'" form)))))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(message "%sdone" m)
|
|
|
|
|
|
alist))
|
|
|
|
|
|
|
2012-10-09 07:00:23 +00:00
|
|
|
|
(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)))))
|
|
|
|
|
|
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(define-button-type 'cusver-xref 'action #'cusver-goto-xref)
|
|
|
|
|
|
|
|
|
|
|
|
(defun cusver-goto-xref (button)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Jump to a Lisp file for the BUTTON at point."
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(let ((file (button-get button 'file))
|
|
|
|
|
|
(var (button-get button 'var)))
|
|
|
|
|
|
(if (not (file-readable-p file))
|
|
|
|
|
|
(message "Cannot read `%s'" file)
|
|
|
|
|
|
(with-current-buffer (find-file-noselect file)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(or (re-search-forward (format "^[ \t]*(defcustom[ \t]*%s" var) nil t)
|
|
|
|
|
|
(message "Unable to locate defcustom"))
|
|
|
|
|
|
(pop-to-buffer (current-buffer))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; You should probably at least do a grep over the old directory
|
2012-10-09 07:00:23 +00:00
|
|
|
|
;; 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.
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(defun cusver-check (newdir olddir version)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
"Check that `defcustom's have :version tags where needed.
|
|
|
|
|
|
NEWDIR is the current lisp/ directory, OLDDIR is that from the
|
|
|
|
|
|
previous release, VERSION is the new version number. A
|
|
|
|
|
|
`defcustom' that is only in NEWDIR should have a :version tag.
|
|
|
|
|
|
We exclude cases where a `defvar' exists in OLDDIR, since just
|
|
|
|
|
|
converting a `defvar' to a `defcustom' does not require
|
|
|
|
|
|
a :version bump.
|
2012-02-11 22:16:10 +00:00
|
|
|
|
|
|
|
|
|
|
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."
|
2013-12-28 08:33:44 +00:00
|
|
|
|
(interactive (list (read-directory-name "New Lisp directory: " nil nil t)
|
|
|
|
|
|
(read-directory-name "Old Lisp directory: " nil nil t)
|
2012-10-07 00:54:36 +00:00
|
|
|
|
(number-to-string
|
|
|
|
|
|
(read-number "New version number: "
|
|
|
|
|
|
(string-to-number cusver-new-version)))))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(or (file-directory-p (setq newdir (expand-file-name newdir)))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(user-error "Directory `%s' not found" newdir))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(or (file-directory-p (setq olddir (expand-file-name olddir)))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(user-error "Directory `%s' not found" olddir))
|
2012-10-06 21:15:03 +00:00
|
|
|
|
(setq cusver-new-version version)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(let* ((newfiles (progn (message "Finding new files with `defcustom's...")
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(cusver-find-files newdir)))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(oldfiles (progn (message "Finding old files with `defcustom's...")
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(cusver-find-files olddir t)))
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(newcus (progn (message "Reading new `defcustom's...")
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(mapcar
|
|
|
|
|
|
(lambda (file)
|
|
|
|
|
|
(cons file (cusver-scan file))) newfiles)))
|
Reduce version number duplication in etc/refcards
* etc/refcards/emacsver.tex: New file.
* etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex:
* etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex:
* etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex:
* refcards/emacsver.tex, etc/refcards/fr-dired-ref.tex:
* etc/refcards/fr-refcard.tex, etc/refcards/fr-survival.tex:
* etc/refcards/orgcard.tex, etc/refcards/pl-refcard.tex:
* etc/refcards/pt-br-refcard.tex, etc/refcards/refcard.tex:
* etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex:
* etc/refcards/sk-survival.tex, etc/refcards/survival.tex:
* etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: Include emacsver.tex.
* refcards/calccard.tex (\emacsversionnumber):
Rename to \versionemacs, same as all the other refcards.
* etc/refcards/Makefile (ENVADD): New variable.
(sk-dired-ref.pdf, sk-survival.pdf, pl-refcard.pdf)
(%.pdf, %,dvi, sk-dired-ref.dvi, sk-survival.dvi, pl-refcard.dvi):
Depend on emacsver.tex. Add "." to TEXINPUTS for TeX commands.
* admin/admin.el (set-version): Set major version in
etc/refcards/ru-refcard.tex and etc/refcards/emacsver.tex.
(set-copyright): In etc/refcards, only change ru-refcard.tex
and emacsver.tex.
* admin.el (cusver-scan, cusver-check): Bind local variables.
* .bzrignore: Add etc/refcards TeX intermediate files.
2012-09-17 07:22:17 +00:00
|
|
|
|
oldcus result thisfile file)
|
2013-12-27 10:21:47 +00:00
|
|
|
|
(message "Reading old `defcustom's...")
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(dolist (file oldfiles)
|
|
|
|
|
|
(setq oldcus (append oldcus (cusver-scan file t))))
|
2012-10-09 07:00:23 +00:00
|
|
|
|
(setq oldcus (append oldcus (cusver-scan-cus-start
|
|
|
|
|
|
(expand-file-name "cus-start.el" olddir))))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
;; newcus has elements (FILE (VAR VER) ... ).
|
|
|
|
|
|
;; oldcus just (VAR . VER).
|
|
|
|
|
|
(message "Checking for version tags...")
|
|
|
|
|
|
(dolist (new newcus)
|
|
|
|
|
|
(setq file (car new)
|
|
|
|
|
|
thisfile
|
|
|
|
|
|
(let (missing var)
|
|
|
|
|
|
(dolist (cons (cdr new))
|
|
|
|
|
|
(or (cdr cons)
|
|
|
|
|
|
(assq (setq var (car cons)) oldcus)
|
|
|
|
|
|
(push var missing)))
|
|
|
|
|
|
(if missing
|
|
|
|
|
|
(cons file missing))))
|
|
|
|
|
|
(if thisfile
|
|
|
|
|
|
(setq result (cons thisfile result))))
|
|
|
|
|
|
(message "Checking for version tags... done")
|
|
|
|
|
|
(if (not result)
|
|
|
|
|
|
(message "No missing :version tags")
|
|
|
|
|
|
(pop-to-buffer "*cusver*")
|
|
|
|
|
|
(erase-buffer)
|
2015-08-27 09:24:48 +00:00
|
|
|
|
(insert (substitute-command-keys
|
|
|
|
|
|
"These `defcustom's might be missing :version tags:\n\n"))
|
2012-02-11 22:16:10 +00:00
|
|
|
|
(dolist (elem result)
|
|
|
|
|
|
(let* ((str (file-relative-name (car elem) newdir))
|
|
|
|
|
|
(strlen (length str)))
|
|
|
|
|
|
(dolist (var (cdr elem))
|
|
|
|
|
|
(insert (format "%s: %s\n" str var))
|
|
|
|
|
|
(make-text-button (+ (line-beginning-position 0) strlen 2)
|
|
|
|
|
|
(line-end-position 0)
|
|
|
|
|
|
'file (car elem)
|
|
|
|
|
|
'var var
|
|
|
|
|
|
'help-echo "Mouse-2: visit this definition"
|
|
|
|
|
|
:type 'cusver-xref)))))))
|
|
|
|
|
|
|
2007-08-28 02:53:08 +00:00
|
|
|
|
(provide 'admin)
|
|
|
|
|
|
|
2008-07-16 02:14:02 +00:00
|
|
|
|
;;; admin.el ends here
|