[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118345: Further reduce the number of versioned file
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118345: Further reduce the number of versioned files storing the version number |
Date: |
Mon, 10 Nov 2014 02:02:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118345
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 18:01:56 -0800
message:
Further reduce the number of versioned files storing the version number
* configure.ac (doc/man/emacs.1): Generate it.
* Makefile.in (top_bootclean): Remove doc/man/emacs.1.
* make-dist: Do not distribute doc/man/emacs.1.
* admin/admin.el (set-version): No need to update doc/man/emacs.1.
* doc/man/emacs.1.in: Rename from emacs.1.
* .bzrignore: Add doc/man/emacs.1.
renamed:
doc/man/emacs.1 => doc/man/emacs.1.in
emacs.1-20091113204419-o5vbwnq5f7feedwu-6123
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
doc/man/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6126
make-dist makedist-20091113204419-o5vbwnq5f7feedwu-476
doc/man/emacs.1.in emacs.1-20091113204419-o5vbwnq5f7feedwu-6123
=== modified file '.bzrignore'
--- a/.bzrignore 2014-11-10 00:57:01 +0000
+++ b/.bzrignore 2014-11-10 02:01:56 +0000
@@ -79,6 +79,7 @@
!doc/lispintro/cons-*.pdf
!doc/lispintro/drawers.pdf
!doc/lispintro/lambda-*.pdf
+doc/man/emacs.1
etc/emacs.tmpdesktop
!etc/refcards/Makefile
etc/refcards/emacsver.tex
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-11-10 00:57:01 +0000
+++ b/ChangeLog 2014-11-10 02:01:56 +0000
@@ -1,5 +1,9 @@
2014-11-10 Glenn Morris <address@hidden>
+ * configure.ac (doc/man/emacs.1): Generate it.
+ * Makefile.in (top_bootclean): Remove doc/man/emacs.1.
+ * make-dist: Do not distribute doc/man/emacs.1.
+
* configure.ac (etc/refcards/emacsver.tex): Generate it.
* Makefile.in (etc-emacsver): New PHONY rule.
(bootstrap-clean): Delete etc/refcards/emacsver.tex.
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-11-10 00:57:01 +0000
+++ b/Makefile.in 2014-11-10 02:01:56 +0000
@@ -822,7 +822,7 @@
### `bootclean'
### Delete all files that need to be remade for a clean bootstrap.
top_bootclean=\
- rm -f config.cache config.log
+ rm -f config.cache config.log ${srcdir}/doc/man/emacs.1
### `distclean'
### Delete all files from the current directory that are created by
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2014-11-10 01:16:27 +0000
+++ b/admin/ChangeLog 2014-11-10 02:01:56 +0000
@@ -1,5 +1,7 @@
2014-11-10 Glenn Morris <address@hidden>
+ * admin.el (set-version): No need to update doc/man/emacs.1.
+
* admin.el (set-version): No need to update etc/refcards/emacsver.tex.
(set-copyright): Update etc/refcards/emacsver.tex.in.
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2014-11-10 01:22:24 +0000
+++ b/admin/admin.el 2014-11-10 02:01:56 +0000
@@ -94,10 +94,6 @@
(rx (and "AC_INIT" (1+ (not (in ?,)))
?, (0+ 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."))))))
;; No longer used, broken in multiple ways, updating version seems pointless.
(set-version-in-file root "nt/config.nt" version
(rx (and bol "#" (0+ blank) "define" (1+ blank)
=== modified file 'configure.ac'
--- a/configure.ac 2014-11-10 00:57:01 +0000
+++ b/configure.ac 2014-11-10 02:01:56 +0000
@@ -5111,6 +5111,9 @@
AC_SUBST(ns_check_file)
fi
+dnl config.status treats $srcdir specially, so I think this is ok...
+AC_CONFIG_FILES([$srcdir/doc/man/emacs.1])
+
dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES.
dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory
dnl using automake (ie lib/) is explicitly listed and not "hidden" in a
variable
=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2014-10-20 19:59:41 +0000
+++ b/doc/man/ChangeLog 2014-11-10 02:01:56 +0000
@@ -1,3 +1,7 @@
+2014-11-10 Glenn Morris <address@hidden>
+
+ * emacs.1.in: Rename from emacs.1.
+
2014-10-20 Glenn Morris <address@hidden>
* Merge in all changes up to 24.4 release.
=== renamed file 'doc/man/emacs.1' => 'doc/man/emacs.1.in'
--- a/doc/man/emacs.1 2014-10-30 05:15:28 +0000
+++ b/doc/man/emacs.1.in 2014-11-10 02:01:56 +0000
@@ -1,5 +1,5 @@
.\" See section COPYING for copyright and redistribution information.
-.TH EMACS 1 "2007 April 13" "GNU Emacs 25.0.50"
+.TH EMACS 1 "2007 April 13" "GNU Emacs @version@"
.
.
.SH NAME
@@ -579,7 +579,7 @@
.
.
.SH BUGS
-There is a mailing list, address@hidden, for reporting Emacs
+There is a mailing list, @PACKAGE_BUGREPORT@, for reporting Emacs
bugs and fixes.
But before reporting something as a bug, please try to be sure that
it really is a bug, not a misunderstanding or a deliberate feature.
=== modified file 'make-dist'
--- a/make-dist 2014-11-10 00:17:17 +0000
+++ b/make-dist 2014-11-10 02:01:56 +0000
@@ -503,8 +503,9 @@
echo "Making links to \`doc/man'"
(cd doc/man
- ln ChangeLog* *.1 ../../${tempdir}/doc/man
- cd ../../${tempdir}/doc/man)
+ ln ChangeLog* *.1 *.in ../../${tempdir}/doc/man
+ cd ../../${tempdir}/doc/man
+ rm -f emacs.1)
### It would be nice if they could all be symlinks to top-level copy, but
### you're not supposed to have any symlinks in distribution tar files.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118345: Further reduce the number of versioned files storing the version number,
Glenn Morris <=