diff options
Diffstat (limited to 'config/gr_version.m4')
| -rw-r--r-- | config/gr_version.m4 | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/config/gr_version.m4 b/config/gr_version.m4 index 3360b7d54d..a7a202238d 100644 --- a/config/gr_version.m4 +++ b/config/gr_version.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2009 Free Software Foundation, Inc. +dnl Copyright 2009,2010 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -25,50 +25,49 @@ AC_DEFUN([GR_VERSION],[ dnl dnl MAJOR_VERSION Major release generation (2.x, 3.x, etc.) dnl API_COMPAT API compatibility version (3.2.x, 3.3.x, etc.) - dnl MINOR_VERSION Minor release version + dnl MINOR_VERSION Minor release version (3.3.0, 3.3.1, etc.) dnl MAINT_VERSION Pure bugfix additions to make maintenance release dnl dnl The last two fields can have 'git' instead of a number to indicate dnl that this branch is between versions. . $srcdir/version.sh - RELEASE=$MAJOR_VERSION.$API_COMPAT dnl Get git version if available GR_GIT dnl Test if we should use git version if test "$MINOR_VERSION" == "git"; then - dnl 3.3git-xxx-gxxxxxxxx - RELEASE=$RELEASE$MINOR_VERSION - DOCVER=$RELEASE - if test "$GIT_VERSION" != "" ; then - RELEASE=$RELEASE-$GIT_VERSION - fi + dnl RELEASE: 3.3git-xxx-gxxxxxxxx + dnl DOCVER: 3.3git + dnl LIBVER: 3.3git + RELEASE=$GIT_DESCRIBE + DOCVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION + LIBVER=$MAJOR_VERSION.$API_COMPAT$MINOR_VERSION else if test "$MAINT_VERSION" == "git" ; then - dnl 3.3.1git-xxx-gxxxxxxxx - RELEASE=$RELEASE.$MINOR_VERSION$MAINT_VERSION - DOCVER=$RELEASE - if test "$GIT_VERSION" != "" ; then - RELEASE=$RELEASE-$GIT_VERSION - fi + dnl RELEASE: 3.3.1git-xxx-gxxxxxxxx + dnl DOCVER: 3.3.1git + dnl LIBVER: 3.3.1git + RELEASE=$GIT_DESCRIBE + DOCVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION + LIBVER=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION$MAINT_VERSION else - dnl This is a numbered reelase. - dnl Test if minor version is 0, which we don't encode, unless it is also - dnl a maintenance release - if test "$MINOR_VERSION" != "0" -o "$MAINT_VERSION" != "0"; then - dnl 3.3.1 - RELEASE=$RELEASE.$MINOR_VERSION - if test "$MAINT_VERSION" != "0"; then - dnl 3.3.0.1, 3.3.1.1 - RELEASE=$RELEASE.$MAINT_VERSION - fi - DOCVER=$RELEASE + dnl This is a numbered release. + dnl RELEASE: 3.3.1{.x} + dnl DOCVER: 3.3.1{.x} + dnl LIBVER: 3.3.1{.x} + RELEASE=$MAJOR_VERSION.$API_COMPAT.$MINOR_VERSION + if test "$MAINT_VERSION" != "0"; then + RELEASE=$RELEASE.$MAINT_VERSION fi + + DOCVER=$RELEASE + LIBVER=$RELEASE fi fi AC_MSG_NOTICE([GNU Radio Release $RELEASE]) AC_SUBST(RELEASE) AC_SUBST(DOCVER) + AC_SUBST(LIBVER) ]) |