changeset: 4419:eb82fbb675eaf416e276645ef7842240473d6cbe tag: tip user: Mike Sperber <sperber(a)deinprogramm.de&gt; date: Thu Feb 07 10:03:49 2008 +0100 files: .hgignore ChangeLog Makefile.in.in configure configure.ac lisp/ChangeLog lisp/build-report.el nt/ChangeLog nt/xemacs.mak src/ChangeLog src/emacs.c version.sh version.sh.in description: Use Mercurial changeset hash to identify build version. 2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; * Makefile.in.in: * configure.ac: * version.sh.in: Use Mercurial tip hash to identify version instead of old CVS method. 2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; * build-report.el (build-report-version-file-regexp): Adjust to handle Mercurial hash. 2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; * xemacs.mak (version.sh): Generate version.sh via Mercurial. 2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; * emacs.c (vars_of_emacs): Zap mention of CVS. diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe .hgignore --- a/.hgignore Mon Feb 04 21:41:27 2008 -0700 +++ b/.hgignore Thu Feb 07 10:03:49 2008 +0100 ＠＠ -52,3 +52,4 ＠＠ info/.*\.info(-[0-9]+)?$ ^src/REBUILD_AUTOLOADS$ ^src/(temacs|xemacs)\.(exe|exe\.manifest|pdb|map|bsc)$ ^TAGS$ +^version\.sh$ \ No newline at end of file diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe ChangeLog --- a/ChangeLog Mon Feb 04 21:41:27 2008 -0700 +++ b/ChangeLog Thu Feb 07 10:03:49 2008 +0100 ＠＠ -1,6 +1,13 ＠＠ 2008-01-25 Stephen J. Turnbull <stephe 2008-01-25 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * configure.ac (--with-database): 'gnudbm' -> 'gdbm' in docstrings. + +2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; + + * Makefile.in.in: + * configure.ac: + * version.sh.in: Use Mercurial tip hash to identify version + instead of old CVS method. 2008-01-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe Makefile.in.in --- a/Makefile.in.in Mon Feb 04 21:41:27 2008 -0700 +++ b/Makefile.in.in Thu Feb 07 10:03:49 2008 +0100 ＠＠ -256,7 +256,7 ＠＠ all: Makefile ${GENERATED_HEADERS} ${MAK .PHONY: ${SUBDIR} all beta ## Convenience target for XEmacs beta testers -beta: elcclean all +beta: elcclean update-version all ## Convenience target for XEmacs maintainers ## This would run `make-xemacsdist' if I were really confident that everything ＠＠ -315,6 +315,13 ＠＠ FRC.lisp.finder-inf.el: ${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC cd ./$＠ && $(MAKE) $(RECURSIVE_MAKE_ARGS) all + +## This should be the same code as in configure.ac. +update-version: + cp ${srcdir}/version.sh.in ${srcdir}/version.sh + if test -d ${srcdir}/.hg; then \ + (cd ${srcdir}; hg identify | cut -d " " -f 1 >> version.sh); \ + fi ## Building modules depends on ellcc, found in lib-src. modules/sample modules/ldap modules/zlib modules/base64: lib-src diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe configure --- a/configure Mon Feb 04 21:41:27 2008 -0700 +++ b/configure Thu Feb 07 10:03:49 2008 +0100 ＠＠ -4779,6 +4779,10 ＠＠ case $build_os in *\ *) build_os=`echo " +cp "$srcdir/version.sh.in" "$srcdir/version.sh" +if test -d "$srcdir/.hg"; then + (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh) +fi . "$srcdir/version.sh" || exit 1; if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi : "${verbose=$beta}" diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe configure.ac --- a/configure.ac Mon Feb 04 21:41:27 2008 -0700 +++ b/configure.ac Thu Feb 07 10:03:49 2008 +0100 ＠＠ -1176,6 +1176,11 ＠＠ dnl ------------------------------------ dnl ---------------------------------------- dnl Find out which version of XEmacs this is dnl ---------------------------------------- +dnl This should be the same code as in Makefile.in.in +cp "$srcdir/version.sh.in" "$srcdir/version.sh" +if test -d "$srcdir/.hg"; then + (cd "$srcdir"; hg identify | cut -d " " -f 1 >> version.sh) +fi . "$srcdir/version.sh" || exit 1; dnl Must do the following first to determine verbosity for AC_DEFINE if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe lisp/ChangeLog --- a/lisp/ChangeLog Mon Feb 04 21:41:27 2008 -0700 +++ b/lisp/ChangeLog Thu Feb 07 10:03:49 2008 +0100 ＠＠ -2,6 +2,11 ＠＠ 2008-02-03 Aidan Kehoe <kehoea＠parhasa * iso8859-1.el (ascii-case-table): Correct the order of the arguments to #'put-case-table-pair. + +2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; + + * build-report.el (build-report-version-file-regexp): Adjust to + handle Mercurial hash. 2008-01-21 Aidan Kehoe <kehoea(a)parhasard.net&gt; diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe lisp/build-report.el --- a/lisp/build-report.el Mon Feb 04 21:41:27 2008 -0700 +++ b/lisp/build-report.el Thu Feb 07 10:03:49 2008 +0100 ＠＠ -69,7 +69,7 ＠＠ emacs_minor_version\\s-*=\\s-*\\([0-9]+\ emacs_minor_version\\s-*=\\s-*\\([0-9]+\\) emacs_beta_version\\s-*=\\s-*\\([0-9]+\\)? xemacs_codename\\s-*=\\s-*\"\\([^\"]+\\)\"\\( -xemacs_extra_name\\s-*=\\s-*\"\\([^\"]+\\)\"\\)?" +xemacs_extra_name\\s-*=\\s-*\"?\\([^\"]+\\)\"?\\)?" "*REGEXP matching XEmacs Beta Version variable assignments in `build-report-version-file' file. This variable is used by `build-report-version-file-data'.") diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe nt/ChangeLog --- a/nt/ChangeLog Mon Feb 04 21:41:27 2008 -0700 +++ b/nt/ChangeLog Thu Feb 07 10:03:49 2008 +0100 ＠＠ -1,3 +1,7 ＠＠ 2008-01-24 Mike Sperber <mike(a)xemacs.o +2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; + + * xemacs.mak (version.sh): Generate version.sh via Mercurial. + 2008-01-24 Mike Sperber <mike(a)xemacs.org&gt; * config.inc.samp: Fix URL for optional libraries. diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe nt/xemacs.mak --- a/nt/xemacs.mak Mon Feb 04 21:41:27 2008 -0700 +++ b/nt/xemacs.mak Thu Feb 07 10:03:49 2008 +0100 ＠＠ -74,6 +74,13 ＠＠ BLDROOT=$(MAKEROOT) !endif !endif +!if [copy $(SRCROOT)\version.sh.in $(SRCROOT)\version.sh] +!endif +!if exist($(SRCROOT)\.hg) +!if [hg identify >> $(SRCROOT)\version.sh] +!endif +!endif + # Program name and version !include "$(SRCROOT)\version.sh" ＠＠ -816,7 +823,7 ＠＠ TEMACS_CPP_FLAGS_NO_CFLAGS=-c $(CPLUSPLU $(EMACS_BETA_VERSION) $(EMACS_PATCH_LEVEL) \ -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ !if defined(xemacs_extra_name) - -DXEMACS_EXTRA_NAME=\"$(xemacs_extra_name:"=)\" \ + -DXEMACS_EXTRA_NAME=\""$(xemacs_extra_name:"=)"\" \ !endif !if defined(PATH_LATE_PACKAGE_DIRECTORIES) -DPATH_LATE_PACKAGE_DIRECTORIES=\"$(PATH_LATE_PACKAGE_DIRECTORIES)\" \ diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe src/ChangeLog --- a/src/ChangeLog Mon Feb 04 21:41:27 2008 -0700 +++ b/src/ChangeLog Thu Feb 07 10:03:49 2008 +0100 ＠＠ -23,6 +23,10 ＠＠ 2008-01-30 Aidan Kehoe <kehoea＠parhasa documentation. Correct an assertion dealing with equivalence tables; we may end up looking through the equivalence table if a non-ASCII non-case character was searched for. + +2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; + + * emacs.c (vars_of_emacs): Zap mention of CVS. 2008-01-24 Mike Sperber <mike(a)xemacs.org&gt; diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe src/emacs.c --- a/src/emacs.c Mon Feb 04 21:41:27 2008 -0700 +++ b/src/emacs.c Thu Feb 07 10:03:49 2008 +0100 ＠＠ -4246,10 +4246,9 ＠＠ Appropriate surrounding whitespace will Appropriate surrounding whitespace will be added, but typically looks best if enclosed in parentheses. -A standard use is to indicate the date version.sh was last updated from -the CVS mainline, where it is automatically given a value similar to -\"(+CVS-20050221)\". Developers may also use it to indicate particular -branches, etc. +A standard use is to indicate the topmost hash id of the Mercurial +changeset from which XEmacs was compiled. Developers may also use it +to indicate particular branches, etc. */ ); #ifdef XEMACS_EXTRA_NAME Vxemacs_extra_name = build_string (XEMACS_EXTRA_NAME); diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe version.sh.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/version.sh.in Thu Feb 07 10:03:49 2008 +0100 ＠＠ -0,0 +1,12 ＠＠ +#!/bin/sh +emacs_is_beta=t +emacs_major_version=21 +emacs_minor_version=5 +emacs_beta_version=28 +xemacs_codename="fuki" +emacs_kit_version= +infodock_major_version=4 +infodock_minor_version=0 +infodock_build_version=8 +xemacs_release_date="2007-05-21" +xemacs_extra_name= \ No newline at end of file diff -r 9bcdf9a3a783dd60aa09e1aadce72cca9d534e58 -r eb82fbb675eaf416e276645ef7842240473d6cbe version.sh --- a/version.sh Mon Feb 04 21:41:27 2008 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 ＠＠ -1,12 +0,0 ＠＠ -#!/bin/sh -emacs_is_beta=t -emacs_major_version=21 -emacs_minor_version=5 -emacs_beta_version=28 -xemacs_codename="fuki" -emacs_kit_version= -infodock_major_version=4 -infodock_minor_version=0 -infodock_build_version=8 -xemacs_extra_name="(+CVS-20071205)" -xemacs_release_date="2007-05-21" _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches