[elpa] 293/299: Use autoconf variables for preview version and date.

[Stefan Monnier]

monnier pushed a commit to branch externals/auctex
in repository elpa.

commit 05ff7de0ed212018c8daaf7d110b1938d3663fd7
Author: Mosè Giordano <address@hidden>
Date:   Wed Oct 29 12:17:01 2014 +0100

    Use autoconf variables for preview version and date.
    
    * .gitignore: Ignore preview/preview.el.
    
    * Makefile.in (DISTCLEANFILES): Add preview/preview.el.
    (release-commit): Write new version announcement also into
    preview/ChangeLog.
    
    * aclocal.m4: Add a third argument to
    `AC_DATE_VERSION_FROM_CHANGELOG' specifying the ChangeLog file.
    
    * configure.ac: Use new third argument of
    `AC_DATE_VERSION_FROM_CHANGELOG'.  Retrieve preview date and
    version from its ChangeLog.  Add preview/preview.el to output
    files.
    
    * preview/preview.el.in: Rename from "preview/preview.el".
    (preview-version): Use @PREVIEWVERSION@ autoconf variable.
    (preview-release-date): Use @PREVIEWDATE@ autoconf variable.
    (preview-report-bug): Adapt to new `preview-version' format.
---
 .gitignore                            |    2 +-
 ChangeLog                             |   16 +++++++++
 Makefile.in                           |    7 +++-
 aclocal.m4                            |    4 +-
 configure.ac                          |    8 +++-
 preview/ChangeLog                     |    7 ++++
 preview/{preview.el => preview.el.in} |   58 +++++++++++----------------------
 7 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index d663413..678205e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,5 @@ preview/latex/prshowlabels.def
 preview/latex/prtightpage.def
 preview/latex/prtracingall.def
 preview/preview-latex.el
+preview/preview.el
 PROBLEMS.preview
-
diff --git a/ChangeLog b/ChangeLog
index 7bb8f15..32afec3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2014-10-29  Mos� Giordano  <address@hidden>
+
+       * .gitignore: Ignore preview/preview.el.
+
+       * Makefile.in (DISTCLEANFILES): Add preview/preview.el.
+       (release-commit): Write new version announcement also into
+       preview/ChangeLog.
+
+       * aclocal.m4: Add a third argument to
+       `AC_DATE_VERSION_FROM_CHANGELOG' specifying the ChangeLog file.
+
+       * configure.ac: Use new third argument of
+       `AC_DATE_VERSION_FROM_CHANGELOG'.  Retrieve preview date and
+       version from its ChangeLog.  Add preview/preview.el to output
+       files.
+
 2014-10-22  Mos� Giordano  <address@hidden>
 
        * RELEASE: Update AUCTeX version, the new features section, and
diff --git a/Makefile.in b/Makefile.in
index 583b6e7..d36a9db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,7 +139,7 @@ STYLEELC = $(STYLESRC:.el=.elc)
 
 CLEANFILES = $(AUCELC) $(STYLEELC) $(MULEELC)
 DISTCLEANFILES = Makefile tex-site.el tex-site.el.out auctex.el \
-       auto-loads.el config.*
+       auto-loads.el config.* preview/preview.el
 DISTTEXTS = FAQ INSTALL INSTALL.windows README TODO PROBLEMS.preview
 
 NOSEARCH = style/.nosearch
@@ -370,14 +370,17 @@ release-commit: check-tag
        @echo "Tagging release $(TAG) in Git ..."
        sleep 5
        mv ChangeLog ChangeLog.old
+       mv preview/ChangeLog preview/ChangeLog.old
 # Make sure the release ChangeLog entry is encoded with ISO-8859-1.  This
 # requires the `iconv' program.
        echo `date "+%Y-%m-%d "`" ${COMMITTER}" | iconv -t ISO-8859-1 - > 
ChangeLog
        echo >> ChangeLog
        echo "  * Version" $(TAG) released. >> ChangeLog
        echo >> ChangeLog
+       cp ChangeLog preview/ChangeLog
        cat ChangeLog.old >> ChangeLog
-       git commit -m 'Release_$(TAG)' -- ChangeLog
+       cat preview/ChangeLog.old >> preview/ChangeLog
+       git commit -m 'Release_$(TAG)' -- ChangeLog preview/ChangeLog
        git tag release_`echo $(TAG) | sed -e 's/[.]/_/g'`
        @echo
        @echo "Congratulations!  Release $(TAG) of AUCTeX is ready."
diff --git a/aclocal.m4 b/aclocal.m4
index f492cc2..9b29ec0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -94,14 +94,14 @@ fi
 
 AC_DEFUN(AC_DATE_VERSION_FROM_CHANGELOG, [
 AC_MSG_CHECKING([for date in ChangeLog])
-$1=[`sed -n '1s/^\([-0-9][-0-9]*\).*/\1/p' ChangeLog`]
+$1=[`sed -n '1s/^\([-0-9][-0-9]*\).*/\1/p' "$3"`]
 if test "X${$1}" = X
 then
   AC_MSG_ERROR([[not found]])
 fi
 AC_MSG_RESULT(${$1})
 AC_MSG_CHECKING([for release in ChangeLog])
-$2=[`sed -n '2,/^[0-9]/s/.*Version \(.*\) released\..*/\1/p' ChangeLog`]
+$2=[`sed -n '2,/^[0-9]/s/.*Version \(.*\) released\..*/\1/p' "$3"`]
 if test "X${$2}" = X
 then
   $2=${$1}
diff --git a/configure.ac b/configure.ac
index 45ef2de..06bea48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,14 @@ AC_CHECK_PROGS_REQUIRED(MAKECMD, make, [make not found, 
aborting!])
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 
-AC_DATE_VERSION_FROM_CHANGELOG(AUCTEXDATE,AUCTEXVERSION)
+AC_DATE_VERSION_FROM_CHANGELOG(AUCTEXDATE,AUCTEXVERSION,ChangeLog)
 AC_SUBST(AUCTEXDATE)
 AC_SUBST(AUCTEXVERSION)
 
+AC_DATE_VERSION_FROM_CHANGELOG(PREVIEWDATE,PREVIEWVERSION,preview/ChangeLog)
+AC_SUBST(PREVIEWDATE)
+AC_SUBST(PREVIEWVERSION)
+
 EMACS_PROG_EMACS
 
 if test ${EMACS_FLAVOR} = xemacs
@@ -197,7 +201,7 @@ AC_SHELL_QUOTIFY(TEXI2HTML)
 AC_SHELL_QUOTIFY(TEXI2DVI)
 AC_SHELL_QUOTIFY(TEXI2PDF)
 
-AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in doc/Makefile auctex.el)
+AC_OUTPUT(Makefile tex-site.el.out:tex-site.el.in preview/preview.el 
doc/Makefile auctex.el)
 
 
 cat >&2 <<EOF
diff --git a/preview/ChangeLog b/preview/ChangeLog
index 5ad7682..fd4a2f9 100644
--- a/preview/ChangeLog
+++ b/preview/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-29  Mos� Giordano  <address@hidden>
+
+       * preview.el.in: Rename from "preview/preview.el".
+       (preview-version): Use @PREVIEWVERSION@ autoconf variable.
+       (preview-release-date): Use @PREVIEWDATE@ autoconf variable.
+       (preview-report-bug): Adapt to new `preview-version' format.
+
 2014-06-24  Tassilo Horn  <address@hidden>
 
        * preview.el (preview-gs-command): Don't run the mgs command if
diff --git a/preview/preview.el b/preview/preview.el.in
similarity index 99%
rename from preview/preview.el
rename to preview/preview.el.in
index 8077af4..57e056b 100644
--- a/preview/preview.el
+++ b/preview/preview.el.in
@@ -249,7 +249,7 @@ that is."
                               preview-image-creators))))))
     (when hook
       (apply (car hook) (append (cdr hook) rest)))))
-                  
+
 
 (defvar TeX-active-tempdir nil
   "List of directory name, top directory name and reference count.")
@@ -457,7 +457,7 @@ show as response of Ghostscript."
       (preview-gs-flag-error ov err)
       (overlay-put ov 'queued nil))
     ov))
-    
+
 (defvar preview-gs-command-line nil)
 (make-variable-buffer-local 'preview-gs-command-line)
 (defvar preview-gs-file nil)
@@ -649,7 +649,7 @@ and tries to restart Ghostscript if necessary."
                            (preview-delete-file preview-ps-file)
                          (file-error nil)))
                      (preview-gs-queue-empty))
-                 
+
                  ;; restart only if we made progress since last call
                  (let (filenames)
                    (dolist (ov preview-gs-outstanding)
@@ -1058,7 +1058,7 @@ object corresponding to the wanted page."
   (let ((curpage (aref dsc page)))
     (format "dup %d setfileposition %d()/SubFileDecode filter cvx"
            (1- (car curpage)) (nth 1 curpage))))
-  
+
 (defun preview-ps-quote-filename (str &optional nonrel)
   "Make a PostScript string from filename STR.
 The file name is first made relative unless
@@ -1327,7 +1327,7 @@ recursively."
        ((and (symbolp hook) (boundp hook))
         (symbol-value hook))
        (t hook)))
-                         
+
 (defcustom preview-scale-function #'preview-scale-from-face
   "*Scale factor for included previews.
 This can be either a function to calculate the scale, or
@@ -1499,7 +1499,7 @@ All of the options show reasonable defaults."
                                     (key-binding [right])))
                       function (list :tag "Argument list"
                                      (repeat :inline t sexp)))))
-  
+
 (defun preview-auto-reveal-p (mode distance)
   "Decide whether to auto-reveal.
 Returns non-NIL if region should be auto-opened.
@@ -1599,7 +1599,7 @@ Searches backwards if BACKWARDS is non-nil."
            '(active inactive)))
        (setq history (and (not preview-state) pt)))
       (or history pt))))
-            
+
 (defun preview-at-point ()
   "Do the appropriate preview thing at point.
 If point is positioned on or inside of an unmodified preview area,
@@ -1829,7 +1829,7 @@ BUFFER-MISC is the appropriate data to be used."
                                   (with-current-buffer ,(current-buffer)
                                     (preview-buffer-restore-internal
                                      ',buffer-misc)))))
-  
+
 (defun desktop-buffer-preview (desktop-buffer-file-name
                               desktop-buffer-name
                               desktop-buffer-misc)
@@ -1949,7 +1949,7 @@ Deletes the dvi file when finished."
             (with-current-buffer TeX-command-buffer
               (funcall (car gsfile) "dvi"))))
        (file-error nil)))))
-   
+
 (defun preview-active-string (ov)
   "Generate before-string for active image overlay OV."
   (preview-make-clickable
@@ -2757,10 +2757,10 @@ name(\\([^)]+\\))\\)\\|\
                                    (setq lpoint (point))
                                    (end-of-line)
                                    (buffer-substring lpoint (point)))
-                           
+
                            ;; And the context for the help window.
                            context-start (point)
-                           
+
                            ;; And the line number to position the cursor.
 ;;; variant 1: profiling seems to indicate the regexp-heavy solution
 ;;; to be favorable.  Removing incomplete characters from the error
@@ -2777,7 +2777,7 @@ name(\\([^)]+\\))\\)\\|\
                                                       (- (match-end 3)
                                                          (match-beginning 0)))
                                                    (match-end 4)))
-                           
+
                            ;; And we have now found to the end of the context.
                            context (buffer-substring context-start (point))
                            ;; We may use these in another buffer.
@@ -3397,7 +3397,7 @@ stored in `preview-dumped-alist'."
      (preview-string-expand preview-LaTeX-command)
      'TeX-master-file)
     preview-LaTeX-command-replacements)))
-                      
+
 (defun preview-environment (count)
   "Run preview on LaTeX environment.
 This avoids running environments through preview that are
@@ -3526,30 +3526,12 @@ internal parameters, STR may be a log to insert into 
the current log."
             (delete-process process)
             (preview-reraise-error process)))))
 
-(defconst preview-version (eval-when-compile
-  (let ((name "$Name:  $")
-       (rev "$Revision: 1.287 $"))
-    (or (when (string-match "\\`[$]Name: *release_\\([^ ]+\\) *[$]\\'" name)
-         (setq name (match-string 1 name))
-         (while (string-match "_" name)
-           (setq name (replace-match "." t t name)))
-         name)
-       (if (string-match "\\`[$]Revision: *\\([^ ]+\\) *[$]\\'" rev)
-           (format "CVS-%s" (match-string 1 rev)))
-       "unknown")))
+(defconst preview-version "@PREVIEWVERSION@"
   "Preview version.
-If not a regular release, CVS revision of `preview.el'.")
-
-(defconst preview-release-date
-  (eval-when-compile
-    (let ((date "$Date: 2012-12-04 08:01:34 $"))
-      (string-match
-       "\\`[$]Date: *\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)"
-       date)
-      (format "%s.%s%s" (match-string 1 date) (match-string 2 date)
-             (match-string 3 date))))
-  "Preview release date.
-In the form of yyyy.mmdd")
+If not a regular release, the date of the last change.")
+
+(defconst preview-release-date "@PREVIEWDATE@"
+  "Preview release date using the ISO 8601 format, yyyy-mm-dd.")
 
 (defun preview-dump-state (buffer)
   (condition-case nil
@@ -3574,9 +3556,7 @@ In the form of yyyy.mmdd")
   (let ((reporter-prompt-for-summary-p "Bug report subject: "))
     (reporter-submit-bug-report
      "address@hidden"
-     (if (string-match "^CVS-" preview-version)
-        (concat "preview-" (substring preview-version 4))
-       preview-version)
+     preview-version
      '(AUCTeX-version
        LaTeX-command-style
        image-types