Hi list, we haven't forget the plan to release a new version of AUCTeX, it just turned out there are some minor non-user-visible issues about the version variables in the preview package.
In particular, the variables `preview-version' and `preview-release-date' rely on CVS tags, but we don't use CVS anymore, but it is easy to fix as shown in the attached (non complete, for brevity) patch. The problem is the source of preview/latex/preview.dtx: date and version rely, again, on CVS tags, see lines 439-450 of the current source code. They should be replaced by the values of the variables PREVIEWDATE and PREVIEWVERSION, set by automake, and are of the form "2014-06-24" and "11.88", the former for both PREVIEWDATE and PREVIEWVERSION, and the latter for PREVIEWVERSION when the last change is a regular release. My question is: how should preview/latex/preview.dtx be accommodated to work with such strings? Thanks, Mosè
diff --git a/.gitignore b/.gitignore index d663413..7997f7e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ preview/latex/prcounters.def preview/latex/preview-mk.ins preview/latex/preview.aux preview/latex/preview.drv +preview/latex/preview.dtx preview/latex/preview.dvi preview/latex/preview.pdf preview/latex/preview.sty @@ -40,5 +41,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/Makefile.in b/Makefile.in index 583b6e7..8ec6992 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/latex/preview.dtx 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..f371ac8 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 preview/latex/preview.dtx doc/Makefile auctex.el) cat >&2 <<EOF
_______________________________________________ auctex-devel mailing list auctex-devel@gnu.org https://lists.gnu.org/mailman/listinfo/auctex-devel