[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118341: Stop keeping etc/refcards/emacsver.tex in t
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118341: Stop keeping etc/refcards/emacsver.tex in the repository |
Date: |
Mon, 10 Nov 2014 00:57:11 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118341
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 16:57:01 -0800
message:
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.
renamed:
etc/refcards/emacsver.tex => etc/refcards/emacsver.tex.in
emacsver.tex-20120917071509-caxos2gouken81i9-1
modified:
.bzrignore bzrignore-20091227212532-2lrlpwjsfm9i221p-1
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/admin.el admin.el-20091113204419-o5vbwnq5f7feedwu-2254
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
etc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1485
etc/refcards/emacsver.tex.in emacsver.tex-20120917071509-caxos2gouken81i9-1
=== modified file '.bzrignore'
--- a/.bzrignore 2014-11-10 00:17:17 +0000
+++ b/.bzrignore 2014-11-10 00:57:01 +0000
@@ -81,6 +81,7 @@
!doc/lispintro/lambda-*.pdf
etc/emacs.tmpdesktop
!etc/refcards/Makefile
+etc/refcards/emacsver.tex
etc/refcards/*.aux
etc/refcards/*.log
info/
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-11-10 00:17:17 +0000
+++ b/ChangeLog 2014-11-10 00:57:01 +0000
@@ -1,5 +1,9 @@
2014-11-10 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-11-08 23:33:36 +0000
+++ b/Makefile.in 2014-11-10 00:57:01 +0000
@@ -288,7 +288,18 @@
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/address@hidden@/$${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 @@
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'
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2014-11-10 00:17:17 +0000
+++ b/admin/ChangeLog 2014-11-10 00:57:01 +0000
@@ -1,5 +1,8 @@
2014-11-10 Glenn Morris <address@hidden>
+ * 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.
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2014-11-10 00:17:17 +0000
+++ b/admin/admin.el 2014-11-10 00:57:01 +0000
@@ -160,9 +160,6 @@
?\( (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 @@
(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"))
=== modified file 'configure.ac'
--- a/configure.ac 2014-11-10 00:17:17 +0000
+++ b/configure.ac 2014-11-10 00:57:01 +0000
@@ -5174,11 +5174,25 @@
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'.])
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2014-11-10 00:04:30 +0000
+++ b/etc/ChangeLog 2014-11-10 00:57:01 +0000
@@ -1,3 +1,7 @@
+2014-11-10 Glenn Morris <address@hidden>
+
+ * refcards/emacsver.tex.in: Rename from emacsver.tex.
+
2014-11-09 Eric Ludlam <address@hidden>
* srecode/doc-cpp.srt (mode): Set to c mode so this works with
=== renamed file 'etc/refcards/emacsver.tex' => 'etc/refcards/emacsver.tex.in'
--- a/etc/refcards/emacsver.tex 2014-09-29 19:49:44 +0000
+++ b/etc/refcards/emacsver.tex.in 2014-11-10 00:57:01 +0000
@@ -1,4 +1,5 @@
-%% 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
+%%% configure updates this using a make rule.
address@hidden@} % 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118341: Stop keeping etc/refcards/emacsver.tex in the repository,
Glenn Morris <=