Re: Getting the CVS revision of Zsh

[Peter Stephenson <pws@xxxxxxx>]

On Wed, 14 Jan 2009 23:36:59 +0000
Clint Adams <schizo@xxxxxxxxxx> wrote:
> On Wed, Jan 14, 2009 at 05:22:35PM +0000, Peter Stephenson wrote:
> > If someone is really bundling individual patches with zsh, so that it is
> > different from any CVS checkout, then I would urge them to alter
> > $ZSH_PATCHLEVEL to avoid exactly the sort of confusion you describe.  I
> > can add a config option to fix a patchlevel if this is useful.
> 
> Yes, we do this.  I can just patch zsh.mdd to work around it though.

In that case Bart's concerns are entirely real and this at least gives us
some kind of hook for people to indicate something funny is going on.

Arguably this should go after the standard version string in $ZSH_VERSION,
but I don't want yet more grief with additional customization.  I've spent
far too much time arguing about this already.

I'm fairly happy ZSH_PATCHLEVEL is enough at least for what I'd like it
do.  It's easy to find out what it should be in a released version and so
check if you're in a released version if you really need to.

Index: INSTALL
===================================================================
RCS file: /cvsroot/zsh/zsh/INSTALL,v
retrieving revision 1.37
diff -u -r1.37 INSTALL
--- INSTALL	30 Oct 2008 12:09:18 -0000	1.37
+++ INSTALL	15 Jan 2009 14:31:56 -0000
@@ -271,6 +271,19 @@
 CONFIGURATION OPTIONS
 =====================
 
+Modified versions of zsh
+------------------------
+
+If you are making local modifications to zsh, you are strongly
+advised to configure with the option
+
+  --enable-local-patchlevel="<my-mod-string>"
+
+so that the variable $ZSH_PATCHLEVEL indicates this is not a standard
+version of the shell.  The argument is arbitrary, but should indicate
+the entity that is customizing the shell, for example the OS vendor
+or distributor.
+
 Multibyte Character Support
 ---------------------------
 
Index: configure.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.ac,v
retrieving revision 1.116
diff -u -r1.116 configure.ac
--- configure.ac	13 Jan 2009 17:10:22 -0000	1.116
+++ configure.ac	15 Jan 2009 14:31:56 -0000
@@ -304,6 +304,14 @@
 AC_SUBST(scriptdir)dnl
 AC_SUBST(sitescriptdir)dnl
 
+AH_TEMPLATE([CUSTOM_PATCHLEVEL],
+[Define to a custom value for the ZSH_PATCHLEVEL parameter])
+AC_ARG_ENABLE(custom-patchlevel,
+AC_HELP_STRING([--enable-custom-patchlevel], [set a custom ZSH_PATCHLEVEL value]),
+[if test x$enableval != x && test x$enableval != xno; then
+  AC_DEFINE_UNQUOTED([CUSTOM_PATCHLEVEL], ["$enableval"])
+fi])
+
 dnl Do you want maildir support?
 ifdef([maildir_support],[undefine([maildir_support])])dnl
 AH_TEMPLATE([MAILDIR_SUPPORT],
Index: Src/params.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/params.c,v
retrieving revision 1.152
diff -u -r1.152 params.c
--- Src/params.c	9 Jan 2009 20:28:30 -0000	1.152
+++ Src/params.c	15 Jan 2009 14:31:57 -0000
@@ -31,7 +31,11 @@
 #include "params.pro"
 
 #include "version.h"
+#ifdef CUSTOM_PATCHLEVEL
+#define ZSH_PATCHLEVEL	CUSTOM_PATCHLEVEL
+#else
 #include "patchlevel.h"
+#endif
 
 /* what level of localness we are at */
  


-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070