diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2008-01-18 17:14:38 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2008-01-18 17:14:38 +0000 |
| commit | 40fec5bb2413a91092e6eaef73ac7f0fd4395589 (patch) | |
| tree | 6208c3503c985d0ece759dbf2c2ec59818ada3b6 | |
| parent | dae7a27fff239e97c5862b2f434284ec4d0d55b5 (diff) | |
| download | zsh-40fec5bb2413a91092e6eaef73ac7f0fd4395589.tar.gz zsh-40fec5bb2413a91092e6eaef73ac7f0fd4395589.tar.xz zsh-40fec5bb2413a91092e6eaef73ac7f0fd4395589.zip | |
24408: use contents of ZSH_EXTRAVERSION environment variable for version suffix.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Etc/zsh-development-guide | 10 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index fbf1a4aab..df4ddb558 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-18 Clint Adams <clint@zsh.org> + + * 24408: configure.ac, Etc/zsh-development-guide: + use contents of ZSH_EXTRAVERSION environment variable for + version suffix. + 2008-01-18 Peter Stephenson <pws@csr.com> * 24406: Src/Zle/compmatch.c: use deep copy of Cline structure diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide index 793e2d255..f0a5ac80e 100644 --- a/Etc/zsh-development-guide +++ b/Etc/zsh-development-guide @@ -856,3 +856,13 @@ The following parameters are currently used: distribution, but that need to be present in the CVS tree. This variable is not used by the zsh build process and is present for the convenience of external checks. + +Version Suffixes +---------------- +The configure script reads the version number from Config/version.mk. +If the environment variable ZSH_EXTRAVERSION is set, the string +contained therein will be appended to the version string. For example, +if Config/version.mk contains "VERSION=4.3.4-dev-7" and +ZSH_EXTRAVERSION is set to "-ca", $ZSH_VERSION in the shell built from +that run will equal "4.3.4-dev-7-ca". Caution is recommended when +using this feature, as is-at-least may misunderstand your conventions. diff --git a/configure.ac b/configure.ac index 8a56a4c05..2d0ba52a6 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ AC_CONFIG_HEADER(config.h) dnl What version of zsh are we building ? . ${srcdir}/Config/version.mk +VERSION="$VERSION$ZSH_EXTRAVERSION" echo "configuring for zsh $VERSION" dnl ---------------------------------------------- |