mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-31 20:02:42 +00:00
Set the version number in the texinfo manuals using configure.
* doc/misc/Makefile.in (emacsdir): New variable. ($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo. * doc/misc/faq.texi (VER): Replace with EMACSVER from emacsver.texi. * doc/lispref/Makefile.in (emacsdir): New variable. (MAKEINFO): Add -I $emacsdir. (dist): Copy emacsver.texi. * doc/lispref/book-spine.texinfo, doc/lispref/elisp.texi: * doc/lispref/vol2.texi, doc/lispref/vol1.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/emacsver.texi.in: New file. * doc/emacs/emacs.texi: Set EMACSVER by including emacsver.texi. * doc/emacs/Makefile.in (distclean): Delete emacsver.texi. (dist): Copy emacsver.texi. * admin/admin.el (set-version): No need to act on doc/ files any more. * configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi. * make-dist: Include doc/emacs/*.texi.in.
This commit is contained in:
Glenn Morris
parent
3fb78d1f33
commit
f7a31f1108
@ -1,5 +1,8 @@
|
||||
2010-10-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* configure.in (AC_OUTPUT): Add doc/emacs/emacsver.texi.
|
||||
* make-dist: Include doc/emacs/*.texi.in.
|
||||
|
||||
* INSTALL, make-dist: Remove references to b2m.
|
||||
* Makefile.in (MAN_PAGES): Remove b2m.1.
|
||||
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
2010-10-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* admin.el (set-version): No need to act on doc/ files any more.
|
||||
|
||||
* quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove b2m.
|
||||
|
||||
2010-09-05 Juanma Barranquero <lekktu@gmail.com>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
;;; admin.el --- utilities for Emacs administration
|
||||
|
||||
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||
;; Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
||||
;; 2010 Free Software Foundation, Inc.
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
|
||||
@ -70,28 +70,10 @@ Root must be the root of an Emacs source tree."
|
||||
(rx (and "AC_INIT" (1+ (not (in ?,)))
|
||||
?, (0+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/emacs/emacs.texi" version
|
||||
(rx (and "EMACSVER" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/lispref/elisp.texi" version
|
||||
(rx (and "EMACSVER" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/lispref/vol1.texi" version
|
||||
(rx (and "EMACSVER" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/lispref/vol2.texi" version
|
||||
(rx (and "EMACSVER" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/lispref/book-spine.texinfo" version
|
||||
(rx (and "Emacs Version" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/man/emacs.1" version
|
||||
(rx (and ".TH EMACS" (1+ not-newline)
|
||||
"GNU Emacs" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "doc/misc/faq.texi" version
|
||||
(rx (and "VER" (1+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
(set-version-in-file root "lib-src/makefile.w32-in" version
|
||||
(rx (and "VERSION" (0+ space) "=" (0+ space)
|
||||
(submatch (1+ (in "0-9."))))))
|
||||
@ -218,5 +200,4 @@ Root must be the root of an Emacs source tree."
|
||||
|
||||
(provide 'admin)
|
||||
|
||||
;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
|
||||
;;; admin.el ends here
|
||||
|
||||
@ -3776,7 +3776,8 @@ dnl the use of force in the `epaths-force' rule in Makefile.in.
|
||||
AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \
|
||||
doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
|
||||
doc/lispref/Makefile src/Makefile \
|
||||
lwlib/Makefile lisp/Makefile leim/Makefile, [
|
||||
lwlib/Makefile lisp/Makefile leim/Makefile \
|
||||
doc/emacs/emacsver.texi, [
|
||||
|
||||
### Make the necessary directories, if they don't exist.
|
||||
for dir in etc lisp ; do
|
||||
@ -3793,6 +3794,3 @@ fi
|
||||
|
||||
], [GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPPFLAGS="$CPPFLAGS"])
|
||||
|
||||
m4_if(dnl Do not change this comment
|
||||
arch-tag: 156a4dd5-bddc-4d18-96ac-f37742cf6a5e
|
||||
)dnl
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
2010-10-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* emacsver.texi.in: New file.
|
||||
* emacs.texi: Set EMACSVER by including emacsver.texi.
|
||||
* Makefile.in (distclean): Delete emacsver.texi.
|
||||
(dist): Copy emacsver.texi.
|
||||
|
||||
* ack.texi (Acknowledgments): No more b2m.c.
|
||||
|
||||
* Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
|
||||
|
||||
@ -159,6 +159,7 @@ clean: mostlyclean
|
||||
rm -f emacs-manual-${version}.tar*
|
||||
|
||||
distclean: clean
|
||||
rm -f emacsver.texi
|
||||
|
||||
## In the standalone tarfile, the clean rule runs this.
|
||||
infoclean:
|
||||
@ -179,6 +180,8 @@ dist:
|
||||
-e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
|
||||
-e "s/@ver[s]ion@/${version}/" \
|
||||
${srcdir}/Makefile.in > emacs-manual-${version}/Makefile
|
||||
sed -e "s/@ver[s]ion@/${version}/" \
|
||||
${srcdir}/emacsver.texi.in > emacs-manual-${version}/emacsver.texi
|
||||
tar -cf emacs-manual-${version}.tar emacs-manual-${version}
|
||||
rm -rf emacs-manual-${version}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
@c The edition number appears in several places in this file
|
||||
@set EDITION Sixteenth
|
||||
@set EMACSVER 24.0.50
|
||||
@include emacsver.texi
|
||||
|
||||
@copying
|
||||
This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@*
|
||||
@ -51,7 +51,6 @@ developing GNU and promoting software freedom.''
|
||||
@tex
|
||||
@ifset smallbook
|
||||
@fonttextsize 10
|
||||
@set EMACSVER 22
|
||||
\global\let\urlcolor=\Black % don't print links in grayscale
|
||||
\global\let\linkcolor=\Black
|
||||
@end ifset
|
||||
@ -1575,7 +1574,3 @@ Lisp programming.
|
||||
@printindex cp
|
||||
|
||||
@bye
|
||||
|
||||
@ignore
|
||||
arch-tag: ed48740a-410b-46ea-9387-c9a9252a3392
|
||||
@end ignore
|
||||
|
||||
1
doc/emacs/emacsver.texi.in
Normal file
1
doc/emacs/emacsver.texi.in
Normal file
@ -0,0 +1 @@
|
||||
@set EMACSVER @version@
|
||||
@ -1,5 +1,11 @@
|
||||
2010-10-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (emacsdir): New variable.
|
||||
(MAKEINFO): Add -I $emacsdir.
|
||||
(dist): Copy emacsver.texi.
|
||||
* book-spine.texinfo, elisp.texi, vol2.texi, vol1.texi:
|
||||
Set EMACSVER by including emacsver.texi.
|
||||
|
||||
* Makefile.in (.PHONY): Declare info, dvi, pdf, dist.
|
||||
|
||||
2010-10-07 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
@ -32,8 +32,10 @@ version=@version@
|
||||
infodir = ../../info
|
||||
# Directory with the (customized) texinfo.tex file.
|
||||
texinfodir = $(srcdir)/../misc
|
||||
# Directory with emacsver.texi.
|
||||
emacsdir = $(srcdir)/../emacs
|
||||
|
||||
MAKEINFO = makeinfo --force
|
||||
MAKEINFO = makeinfo --force -I $(emacsdir)
|
||||
TEXI2DVI = texi2dvi
|
||||
TEXI2PDF = texi2pdf
|
||||
|
||||
@ -143,6 +145,8 @@ dist:
|
||||
-e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
|
||||
-e "s/@ver[s]ion@/${version}/" \
|
||||
${srcdir}/Makefile.in > emacs-lispref-${version}/Makefile
|
||||
sed -e "s/@ver[s]ion@/${version}/" \
|
||||
${emacsdir}/emacsver.texi.in > emacs-lispref-${version}/emacsver.texi
|
||||
tar -cf emacs-lispref-${version}.tar emacs-lispref-${version}
|
||||
rm -rf emacs-lispref-${version}
|
||||
|
||||
|
||||
@ -4,6 +4,8 @@
|
||||
@settitle book-spine
|
||||
@c %**end of header
|
||||
|
||||
@include emacsver.texi
|
||||
|
||||
@c need dot in text so first space command works!
|
||||
.
|
||||
@sp 7
|
||||
@ -11,7 +13,7 @@
|
||||
@center @titlefont{GNU Emacs Lisp Reference Manual}
|
||||
@sp 5
|
||||
@center GNU
|
||||
@center Emacs Version 24.0.50
|
||||
@center Emacs Version @value{EMACSVER}
|
||||
@center for Unix Users
|
||||
@sp 5
|
||||
|
||||
@ -23,7 +25,3 @@
|
||||
@sp 5
|
||||
@center Free Software Foundation
|
||||
@bye
|
||||
|
||||
@ignore
|
||||
arch-tag: 4466c7ca-e549-4119-948c-6eed34e1ff87
|
||||
@end ignore
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
@c Please remember to update the edition number in README as well.
|
||||
@c And also the copies in vol1.texi and vol2.texi.
|
||||
@set VERSION 3.0
|
||||
@set EMACSVER 24.0.50
|
||||
@include emacsver.texi
|
||||
@set DATE July 2009
|
||||
|
||||
@c in general, keep the following line commented out, unless doing a
|
||||
@ -1529,7 +1529,3 @@ Object Internals
|
||||
|
||||
|
||||
These words prevent "local variables" above from confusing Emacs.
|
||||
|
||||
@ignore
|
||||
arch-tag: f7e9a219-a0e1-4776-b631-08eaa1d49b34
|
||||
@end ignore
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
@c Version of the manual and of Emacs.
|
||||
@c Please remember to update the edition number in README as well.
|
||||
@set VERSION 3.0
|
||||
@set EMACSVER 24.0.50
|
||||
@include emacsver.texi
|
||||
@set DATE July 2009
|
||||
|
||||
@dircategory Emacs
|
||||
@ -1550,7 +1550,3 @@ Object Internals
|
||||
|
||||
|
||||
These words prevent "local variables" above from confusing Emacs.
|
||||
|
||||
@ignore
|
||||
arch-tag: 9594760d-8801-4d1b-aeb9-f3b3166b5be2
|
||||
@end ignore
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
@c Version of the manual and of Emacs.
|
||||
@c Please remember to update the edition number in README as well.
|
||||
@set VERSION 3.0
|
||||
@set EMACSVER 24.0.50
|
||||
@include emacsver.texi
|
||||
@set DATE July 2009
|
||||
|
||||
@dircategory Emacs
|
||||
@ -1549,7 +1549,3 @@ Object Internals
|
||||
|
||||
|
||||
These words prevent "local variables" above from confusing Emacs.
|
||||
|
||||
@ignore
|
||||
arch-tag: dfdbecf8-fec2-49c1-8427-3e8ac8b0b849
|
||||
@end ignore
|
||||
|
||||
@ -1,10 +1,14 @@
|
||||
2010-10-09 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (emacsdir): New variable.
|
||||
($(infodir)/efaq): Pass -I $(emacsdir) to makeinfo.
|
||||
* faq.texi (VER): Replace with EMACSVER from emacsver.texi.
|
||||
|
||||
* Makefile.in (.PHONY): Declare info, dvi, pdf and the clean rules.
|
||||
|
||||
2010-10-08 Julien Danjou <julien@danjou.info>
|
||||
|
||||
* gnus.texi: add mm-shr
|
||||
* gnus.texi: Add mm-shr.
|
||||
|
||||
2010-10-08 Ludovic Courtès <ludo@gnu.org>
|
||||
|
||||
|
||||
@ -32,6 +32,9 @@ VPATH=@srcdir@
|
||||
## Where the output files go.
|
||||
## Note that the setfilename command in the .texi files assumes this.
|
||||
infodir=../../info
|
||||
## Directory with emacsver.texi.
|
||||
## Currently only used by efaq; could be added to MAKEINFO.
|
||||
emacsdir = $(srcdir)/../emacs
|
||||
|
||||
# The makeinfo program is part of the Texinfo distribution.
|
||||
# Use --force so that it generates output even if there are errors.
|
||||
@ -362,7 +365,7 @@ eudc.pdf: eudc.texi
|
||||
|
||||
efaq : $(infodir)/efaq
|
||||
$(infodir)/efaq: faq.texi $(infodir)
|
||||
cd $(srcdir); $(MAKEINFO) faq.texi
|
||||
cd $(srcdir); $(MAKEINFO) -I $(emacsdir) faq.texi
|
||||
faq.dvi: faq.texi
|
||||
$(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi
|
||||
faq.pdf: faq.texi
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
@settitle GNU Emacs FAQ
|
||||
@c %**end of header
|
||||
|
||||
@c This is used in many places
|
||||
@set VER 24.0.50
|
||||
@include emacsver.texi
|
||||
|
||||
@c This file is maintained by Romain Francoise <rfrancoise@gnu.org>.
|
||||
@c Feel free to install changes without prior permission (but I'd
|
||||
@ -67,7 +66,7 @@ This FAQ is maintained as a part of GNU Emacs. If you find any errors,
|
||||
or have any suggestions, please use @kbd{M-x report-emacs-bug} to report
|
||||
them.
|
||||
|
||||
This is the version of the FAQ distributed with Emacs @value{VER}, and
|
||||
This is the version of the FAQ distributed with Emacs @value{EMACSVER}, and
|
||||
mainly describes that version. Although there is some information on
|
||||
older versions, details about very old releases (now only of historical
|
||||
interest) have been removed. If you are interested in this, consult
|
||||
@ -1010,7 +1009,7 @@ conventions}).
|
||||
@cindex Repository, Emacs
|
||||
@cindex Bazaar repository, Emacs
|
||||
|
||||
Emacs @value{VER} is the current version as of this writing. A version
|
||||
Emacs @value{EMACSVER} is the current version as of this writing. A version
|
||||
number with two components (e.g. @samp{22.1}) indicates a released
|
||||
version; three components indicate a development
|
||||
version (e.g. @samp{23.0.50} is what will eventually become @samp{23.1}).
|
||||
@ -4479,7 +4478,3 @@ to the end of the @file{*Newsgroup*} buffer.
|
||||
@printindex cp
|
||||
|
||||
@bye
|
||||
|
||||
@ignore
|
||||
arch-tag: fee0d62d-06cf-43d8-ac21-123408eaf10f
|
||||
@end ignore
|
||||
|
||||
@ -666,9 +666,10 @@ echo "Making links to \`info'"
|
||||
ln emacs dummy~ ; ln emacs \#dummy\#
|
||||
rm -f *~ \#*\# core .arch-inventory .gitignore)
|
||||
|
||||
# FIXME ? Why including *.aux etc?
|
||||
echo "Making links to \`doc/emacs'"
|
||||
(cd doc/emacs
|
||||
ln *.texi *.aux *.fns *.kys *.vrs ../../${tempdir}/doc/emacs
|
||||
ln *.texi *.texi.in *.aux *.fns *.kys *.vrs ../../${tempdir}/doc/emacs
|
||||
ln makefile.w32-in ../../${tempdir}/doc/emacs
|
||||
test -f Makefile.in && ln Makefile.in ../../${tempdir}/doc/emacs
|
||||
ln ChangeLog ../../${tempdir}/doc/emacs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user