[Emacs-diffs] trunk r118339: Stop keeping doc/emacs/emacsver.texi in the repository

[Glenn Morris]

------------------------------------------------------------
revno: 118339
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 16:17:17 -0800
message:
  Stop keeping doc/emacs/emacsver.texi in the repository
  
  * configure.ac (doc/emacs/emacsver.texi): Generate it.
  
  * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.
  
  * doc/emacs/Makefile.in (top_srcdir, version): New, set by configure.
  (doc-emacsver): New rule.
  (bootstrap-clean, maintainer-clean): Delete emacsver.texi.
  (emacsver.texi.in): Rename from emacsver.texi.
  
  * admin/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.
  
  * .bzrignore: Add doc/emacs/emacsver.texi.
renamed:
  doc/emacs/emacsver.texi => doc/emacs/emacsver.texi.in 
emacsver.texi.in-20101009013439-2q4vgf941qfsvio7-1
modified:
  .bzrignore                     bzrignore-20091227212532-2lrlpwjsfm9i221p-1
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/admin.el                 admin.el-20091113204419-o5vbwnq5f7feedwu-2254
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/Makefile.in          
makefile.in-20091113204419-o5vbwnq5f7feedwu-6228
  make-dist                      makedist-20091113204419-o5vbwnq5f7feedwu-476
  doc/emacs/emacsver.texi.in     
emacsver.texi.in-20101009013439-2q4vgf941qfsvio7-1

=== modified file '.bzrignore'
--- a/.bzrignore        2014-10-15 17:33:27 +0000
+++ b/.bzrignore        2014-11-10 00:17:17 +0000
@@ -75,6 +75,7 @@
 doc/**/*.html
 doc/**/*.pdf
 doc/**/*.ps
+doc/emacs/emacsver.texi
 !doc/lispintro/cons-*.pdf
 !doc/lispintro/drawers.pdf
 !doc/lispintro/lambda-*.pdf

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-11-08 15:18:06 +0000
+++ b/ChangeLog 2014-11-10 00:17:17 +0000
@@ -1,12 +1,15 @@
+2014-11-10  Glenn Morris  <address@hidden>
+
+       * configure.ac (doc/emacs/emacsver.texi): Generate it.
+       * make-dist (doc/emacs/emacsver.texi) [update]: No longer check it.
+
 2014-11-08  Dani Moncayo  <address@hidden>
 
-       * build-aux/msys-to-w32: simplify the initial over-engineered
+       * build-aux/msys-to-w32: Simplify the initial over-engineered
        interface, and the implementation.
        * Makefile.in (epaths-force-w32): Update for the above.  Also
-       simplify, assuming that the shell is bash (which is the case in
-       MSYS).
-       (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer
-       used).
+       simplify, assuming that the shell is bash (which is the case in MSYS).
+       (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
 
 2014-11-05  Glenn Morris  <address@hidden>
 

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-11-10 00:04:30 +0000
+++ b/admin/ChangeLog   2014-11-10 00:17:17 +0000
@@ -1,3 +1,9 @@
+2014-11-10  Glenn Morris  <address@hidden>
+
+       * 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.
+
 2014-11-09  Eric Ludlam <address@hidden>
 
        * grammars/c.by (template-type): Add :template-specifier and

=== modified file 'admin/admin.el'
--- a/admin/admin.el    2014-11-09 02:02:51 +0000
+++ b/admin/admin.el    2014-11-10 00:17:17 +0000
@@ -94,9 +94,6 @@
                       (rx (and "AC_INIT" (1+ (not (in ?,)))
                                 ?, (0+ space)
                                 (submatch (1+ (in "0-9."))))))
-  (set-version-in-file root "doc/emacs/emacsver.texi" version
-                      (rx (and "EMACSVER" (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)
@@ -611,7 +608,7 @@
 
 
 (defconst make-manuals-dist-output-variables
-  `(("@srcdir@" . ".")
+  `(("@\\(top_\\)?srcdir@" . ".")      ; top_srcdir is wrong, but not used
     ("^\\(\\(?:texinfo\\|buildinfo\\|emacs\\)dir *=\\).*" . "\\1 .")
     ("^\\(clean:.*\\)" . "\\1 infoclean")
     ("@MAKEINFO@" . "makeinfo")
@@ -655,11 +652,13 @@
                   (string-match-p "\\.\\(eps\\|pdf\\)\\'" file)))
          (copy-file file stem)))
     (with-temp-buffer
-      (insert-file-contents (format "../doc/%s/Makefile.in" type))
-      (dolist (cons make-manuals-dist-output-variables)
-       (while (re-search-forward (car cons) nil t)
-         (replace-match (cdr cons) t))
-       (goto-char (point-min)))
+      (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))))
       (let (ats)
        (while (re-search-forward "@[a-zA-Z_]+@" nil t)
          (setq ats t)

=== modified file 'configure.ac'
--- a/configure.ac      2014-10-30 05:15:28 +0000
+++ b/configure.ac      2014-11-10 00:17:17 +0000
@@ -5174,6 +5174,11 @@
 fi
 ])
 
+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.])
+])
+
 AC_OUTPUT
 
 test "$MAKE" = make || AC_MSG_NOTICE([Now you can run '$MAKE'.])

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-11-09 19:19:54 +0000
+++ b/doc/emacs/ChangeLog       2014-11-10 00:17:17 +0000
@@ -1,3 +1,10 @@
+2014-11-10  Glenn Morris  <address@hidden>
+
+       * Makefile.in (top_srcdir, version): New, set by configure.
+       (doc-emacsver): New rule.
+       (bootstrap-clean, maintainer-clean): Delete emacsver.texi.
+       (emacsver.texi.in): Rename from emacsver.texi.
+
 2014-11-09  Juri Linkov  <address@hidden>
 
        * search.texi (Other Repeating Search): Add documentation for

=== modified file 'doc/emacs/Makefile.in'
--- a/doc/emacs/Makefile.in     2014-11-09 02:06:29 +0000
+++ b/doc/emacs/Makefile.in     2014-11-10 00:17:17 +0000
@@ -26,6 +26,10 @@
 # of the source tree.  This is set by configure's `--srcdir' option.
 address@hidden@
 
+top_srcdir = @top_srcdir@
+
+version = @version@
+
 ## Where the output files go.
 ## Note that the setfilename command in the .texi files assumes this.
 ## This is a bit funny.  Because the info files are in the
@@ -178,6 +182,18 @@
 %.ps: %.dvi
        $(DVIPS) -o $@ $<
 
+.PHONY: doc-emacsver
+
+# If configure were to just generate emacsver.texi from emacsver.texi.in
+# in the normal way, the timestamp of emacsver.texi would always be
+# newer than that of the info files, which are prebuilt in release tarfiles.
+# So we use this rule, and move-if-change, to avoid that.
+doc-emacsver:
+       sed 's/address@hidden@/${version}/' \
+         ${srcdir}/emacsver.texi.in > emacsver.texi.in.$$$$ && \
+         ${top_srcdir}/build-aux/move-if-change emacsver.texi.in.$$$$ \
+         ${srcdir}/emacsver.texi
+
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
 
 ## Temp files.
@@ -200,6 +216,7 @@
          $(buildinfodir)/emacs.info-[1-9][0-9]
 
 bootstrap-clean maintainer-clean: distclean infoclean
+       rm -f ${srcdir}/emacsver.texi
 
 .PHONY: install-dvi install-html install-pdf install-ps install-doc
 

=== renamed file 'doc/emacs/emacsver.texi' => 'doc/emacs/emacsver.texi.in'
--- a/doc/emacs/emacsver.texi   2014-10-30 05:15:28 +0000
+++ b/doc/emacs/emacsver.texi.in        2014-11-10 00:17:17 +0000
@@ -1,4 +1,2 @@
address@hidden It would be nicer to generate this using configure and 
@address@hidden
address@hidden However, that would mean emacsver.texi would always be newer
address@hidden then the info files in release tarfiles.
address@hidden EMACSVER 25.0.50
address@hidden configure generates emacsver.texi from emacsver.texi.in via a 
Makefile rule
address@hidden EMACSVER @version@

=== modified file 'make-dist'
--- a/make-dist 2014-08-09 16:12:33 +0000
+++ b/make-dist 2014-11-10 00:17:17 +0000
@@ -169,9 +169,8 @@
 echo Version number is $version
 
 if [ $update = yes ]; then
-  if ! grep -q "@set EMACSVER  *${version}" doc/emacs/emacsver.texi || \
-     ! grep -q "tree holds version  *${version}" README; then
-    echo "WARNING: README and/or emacsver.texi have the wrong version number"
+  if ! grep -q "tree holds version  *${version}" README; then
+    echo "WARNING: README has the wrong version number"
     echo "Consider running M-x set-version from admin/admin.el"
     sleep 5
   fi