From: Glenn Morris Date: Mon, 10 Nov 2014 00:57:01 +0000 (-0800) Subject: Stop keeping etc/refcards/emacsver.tex in the repository X-Git-Tag: emacs-25.0.90~2635^2~515 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/4e65e7e2b9f1966ada00ffb7480982495d48c463 Stop keeping etc/refcards/emacsver.tex in the repository * configure.ac (etc/refcards/emacsver.tex): Generate it. * Makefile.in (etc-emacsver): New PHONY rule. (bootstrap-clean): Delete etc/refcards/emacsver.tex. * admin/admin.el (set-version): No need to update etc/refcards/emacsver.tex. (set-copyright): Update etc/refcards/emacsver.tex.in. * etc/refcards/emacsver.tex.in: Rename from emacsver.tex. * .bzrignore: Add etc/refcards/emacsver.tex. --- diff --git a/ChangeLog b/ChangeLog index 07c334c354..1d94222f64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-11-10 Glenn Morris + * configure.ac (etc/refcards/emacsver.tex): Generate it. + * Makefile.in (etc-emacsver): New PHONY rule. + (bootstrap-clean): Delete etc/refcards/emacsver.tex. + * configure.ac (doc/emacs/emacsver.texi): Generate it. * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it. diff --git a/Makefile.in b/Makefile.in index 236e88cf10..458904710e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -288,7 +288,18 @@ COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}" all: ${SUBDIR} info -.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 +.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver + +# If configure were to just generate emacsver.tex from emacsver.tex.in +# in the normal way, the timestamp of emacsver.tex would always be +# newer than that of the pdf files, which are prebuilt in release tarfiles. +# So we use this rule, and move-if-change, to avoid that. +etc-emacsver: + majorversion=`echo ${version} | sed 's/\..*//'`; \ + sed "s/[@]majorversion@/$${majorversion}/" \ + ${srcdir}/etc/refcards/emacsver.tex.in > emacsver.tex.$$$$ && \ + ${srcdir}/build-aux/move-if-change emacsver.tex.$$$$ \ + ${srcdir}/etc/refcards/emacsver.tex removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' @@ -844,6 +855,7 @@ bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) done [ ! -f config.log ] || mv -f config.log config.log~ rm -rf ${srcdir}/info + rm -f ${srcdir}/etc/refcards/emacsver.tex ${top_bootclean} ### `maintainer-clean' diff --git a/admin/ChangeLog b/admin/ChangeLog index 2ec447b133..f3a7638ba5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,8 @@ 2014-11-10 Glenn Morris + * admin.el (set-version): No need to update etc/refcards/emacsver.tex. + (set-copyright): Update etc/refcards/emacsver.tex.in. + * admin.el (set-version): No need to update doc/emacs/emacsver.texi. (make-manuals-dist-output-variables): Add top_srcdir. (make-manuals-dist--1): Handle @version@ specially. diff --git a/admin/admin.el b/admin/admin.el index 14d851eb20..ce434c6460 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -160,9 +160,6 @@ Root must be the root of an Emacs source tree." ?\( (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 "etc/refcards/emacsver.tex" version - "\\\\def\\\\versionemacs\ {\\([0-9]\\{2,\\}\\)}.+%.+version of Emacs"))) (message "Setting version numbers...done")) @@ -198,7 +195,7 @@ Root must be the root of an Emacs source tree." (set-version-in-file root "etc/refcards/ru-refcard.tex" copyright "\\\\newcommand{\\\\cyear}\\[0\\]\ {\\([0-9]\\{4\\}\\)}.+%.+copyright year") - (set-version-in-file root "etc/refcards/emacsver.tex" copyright + (set-version-in-file root "etc/refcards/emacsver.tex.in" copyright "\\\\def\\\\year\ {\\([0-9]\\{4\\}\\)}.+%.+copyright year")) (message "Setting copyrights...done")) diff --git a/configure.ac b/configure.ac index f7aa407265..819d607759 100644 --- a/configure.ac +++ b/configure.ac @@ -5174,11 +5174,25 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then fi ]) +dnl Perhaps this would be better named doc-emacs-emacsver.texi? +dnl See comments for etc-refcards-emacsver.tex. +dnl Since we get a doc/emacs directory generated anyway, for the Makefile, +dnl it is not quite the same. But we are generating in $srcdir. AC_CONFIG_COMMANDS([doc/emacs/emacsver.texi], [ ${MAKE-make} -s --no-print-directory -C doc/emacs doc-emacsver || \ AC_MSG_ERROR(['doc/emacs/emacsver.texi' could not be made.]) ]) +dnl If we give this the more natural name, etc/refcards/emacsver.texi, +dnl then a directory etc/refcards is created in the build directory, +dnl which is probably harmless, but confusing (in out-of-tree builds). +dnl (If we were to generate etc/refcards/Makefile, this might change.) +dnl It is really $srcdir/etc/refcards/emacsver.tex that we generate. +AC_CONFIG_COMMANDS([etc-refcards-emacsver.tex], [ +${MAKE-make} -s MAKEFILE_NAME=do-not-make-Makefile etc-emacsver || \ +AC_MSG_ERROR(['etc/refcards/emacsver.tex' could not be made.]) +]) + AC_OUTPUT test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.]) diff --git a/etc/ChangeLog b/etc/ChangeLog index c46b103be2..d804297716 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2014-11-10 Glenn Morris + + * refcards/emacsver.tex.in: Rename from emacsver.tex. + 2014-11-09 Eric Ludlam * srecode/doc-cpp.srt (mode): Set to c mode so this works with diff --git a/etc/refcards/emacsver.tex b/etc/refcards/emacsver.tex deleted file mode 100644 index 7e5ff6488d..0000000000 --- a/etc/refcards/emacsver.tex +++ /dev/null @@ -1,4 +0,0 @@ -%% This file is not generated by configure, because then the provided -%% pdf files would always appear out-of-date. -\def\versionemacs{25} % major version of emacs -\def\year{2014} % latest copyright year diff --git a/etc/refcards/emacsver.tex.in b/etc/refcards/emacsver.tex.in new file mode 100644 index 0000000000..911121c15f --- /dev/null +++ b/etc/refcards/emacsver.tex.in @@ -0,0 +1,5 @@ +%%% configure updates this using a make rule. +\def\versionemacs{@majorversion@} % major version of emacs +%% This one should not be automatically updated; +%% M-x set-copyright in admin.el handles it. +\def\year{2014} % latest copyright year