Michael Sperber writes: The above looks fragile, and Adrian Aichner's build.el and build-reports.el have order dependencies. I don't remember the details, but he complained to me when I moved some lines once. How about something like xen_matcher='^.*xemacs_extra_name.*$' xen_value='xemacs_extra_name="(hg: '`hg identify`')"' cd ${srcdir} sed -e "s/${xen_matcher}/${xen_value}/" <version.sh.in >version.sh Note I left in the head identifier. The intent is to pick up a branch name, but if that doesn't work, the cut version works for me. Works for me in a quick test from the shell. What's the deal with ${srcdir}/extra-name? I don't see how that can get initialized to anything sensible, and I would think if it exists, there's an argument for it taking precedence over hg identify. Finally, it occurs to me that cd ${srcdir} echo ";;; local-diff.el --- local differences from tip" > lisp/local-diff.el echo '(setq hg-reference-version "'`hg identify`'")' >> lisp/local-diff.el # Use rawstring literal :-) echo '(setq hg-reference-diff #"' >> lisp/local-diff.el hg diff >> lisp/local-diff.el echo '")' >> lisp/local-diff.el echo ";;; local-diff.el ends here" >> lisp/local-diff.el deserves mention. :-) If that seems a bit privacy-invading, how about hg status? _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

BTW, it occurs to me that the whole approach of setting this in version.sh is probably excessively complicated. We did it that way originally because it was done on the server. Would it be more portable to just set a variable XEMACS_HG_NODEID=`hg identify` in the Makefile and add `-DXEMACS_EXTRA_NAME=" (+hg:${XEMACS_HG_NODEID})"' to CFLAGS or so? (And eliminate the extra_name variable. I can imagine other variants, using a different name for automatically generated version info and reserving extra_name to the user.) Michael Sperber writes: There's nothing that horrible with a little redundancy xemacs_extra_name= xemacs_extra_name="hg:abcdef0123" for Windows, is there? The *code* in my suggestion is fragile, but once it works there's no reason to change it ever, unless you change the name of the option or the whole file format. The file format in yours is fragile in itself; it depends on ordering and lack of a trailing newline. It's also not extensible to a second keyword. I don't like that. The point of xemacs_extra_name is to flag non-release builds. I agree that we should know the revision that the release was built from, but we already know that: it's tagged with an identifier built from the version number, which is reserved to the maintainer and unique by construction. To be pedantic, it doesn't tell you that, because the repo is by definition local. You do not know whether the particular revision is available anywhere else. Regarding the question of internalizing the diff and/or getting a list of modified files, yes, just having the local mods flag should be enough; we get the reporter to do a diff. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

Michael Sperber writes: How should I know? I have no way to access documentation or test. It's not my problem to solve, although I'm certainly in favor of solving it. I don't see why horrible kludges we use to keep psychotic Windows sedated has to seep over to merely neurotic *nix code. If we have to do things differently for native Windows, what else is new? We've got that whole xemacs.mak horror anyway, with its eight different ways to express "cp -r" depending on Windows version. I'm proposing that we can get rid of the rather yucky file that must not be terminated with a newline by simply adding variable assignments at the end. Last one wins, right? Yes, for this purpose they count as releases. They are currently flagged by the *absence* of xemacs_extra_name. Each beta release is tagged in CVS with "r${MAJOR}-${MINOR}-${MICRO}". In CVS of course this is an absolute necessity, since only tags can be common across files. In hg we revision trees, so we have a repo-local sequence number and a global node id (hash) that we could use, but I still plan to tag betas with the same format. (There have been no releases from the hg repo, of course.) Sure, by trying to check it out and failing if it's not ours. But that means all we know about the repo is the last release. This is just an inherent problem with distributed version control. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

Michael Sperber writes: I'm not either. I have no idea how to do better on Windows, either. My intention is not to veto the patch, this is a big bug and it needs to be fixed. I'm trying to see (a) if it can be done better *now* (which doesn't look likely), and (b) how much we know that would be of use in moving forward with improvements *later*. I know nothing about how xemacs.mak works. :( _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches

Sorry this took so long---I've been swamped. I've removed the fallback "extra-name" thing. Otherwise, it's as submitted. I hope we'll eventually improve upon this. Michael Sperber <sperber(a)deinprogramm.de&gt; writes: 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. -- Cheers =8-} Mike Friede, Völkerverständigung und überhaupt blabla changeset: 4419:eb82fbb675ea tag: tip user: Mike Sperber <sperber(a)deinprogramm.de&gt; date: Thu Feb 07 10:03:49 2008 +0100 summary: Use Mercurial changeset hash to identify build version. diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore ＠＠ -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 --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -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 --git a/Makefile.in.in b/Makefile.in.in --- a/Makefile.in.in +++ b/Makefile.in.in ＠＠ -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 --git a/configure b/configure --- a/configure +++ b/configure ＠＠ -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 --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac ＠＠ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog --- a/lisp/ChangeLog +++ b/lisp/ChangeLog ＠＠ -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 --git a/lisp/build-report.el b/lisp/build-report.el --- a/lisp/build-report.el +++ b/lisp/build-report.el ＠＠ -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 --git a/nt/ChangeLog b/nt/ChangeLog --- a/nt/ChangeLog +++ b/nt/ChangeLog ＠＠ -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 --git a/nt/xemacs.mak b/nt/xemacs.mak --- a/nt/xemacs.mak +++ b/nt/xemacs.mak ＠＠ -71,6 +71,13 ＠＠ SEPARATE_BUILD=0 SEPARATE_BUILD=0 SRCROOT=$(MAKEROOT) 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 ＠＠ -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 --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog ＠＠ -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 --git a/src/emacs.c b/src/emacs.c --- a/src/emacs.c +++ b/src/emacs.c ＠＠ -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 --git a/version.sh b/version.sh.in rename from version.sh rename to version.sh.in --- a/version.sh.in +++ b/version.sh.in ＠＠ -8,5 +8,5 ＠＠ infodock_major_version=4 infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -xemacs_extra_name="(+CVS-20071205)" xemacs_release_date="2007-05-21" +xemacs_extra_name= \ No newline at end of file _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches