diff options
| -rw-r--r-- | gr-howto-write-a-block/config/gr_version.m4 | 19 | ||||
| -rw-r--r-- | gr-howto-write-a-block/version.sh | 4 | ||||
| -rw-r--r-- | version.sh | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/gr-howto-write-a-block/config/gr_version.m4 b/gr-howto-write-a-block/config/gr_version.m4 index 3360b7d54..489f78034 100644 --- a/gr-howto-write-a-block/config/gr_version.m4 +++ b/gr-howto-write-a-block/config/gr_version.m4 @@ -25,7 +25,7 @@ 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 @@ -53,18 +53,13 @@ AC_DEFUN([GR_VERSION],[ RELEASE=$RELEASE-$GIT_VERSION fi 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. + RELEASE=$RELEASE.$MINOR_VERSION + if test "$MAINT_VERSION" != "0"; then + RELEASE=$RELEASE.$MAINT_VERSION fi + + DOCVER=$RELEASE fi fi diff --git a/gr-howto-write-a-block/version.sh b/gr-howto-write-a-block/version.sh index b2cad877d..7f533bd29 100644 --- a/gr-howto-write-a-block/version.sh +++ b/gr-howto-write-a-block/version.sh @@ -1,4 +1,4 @@ MAJOR_VERSION=3 API_COMPAT=3 -MINOR_VERSION=git -MAINT_VERSION= +MINOR_VERSION=0-rc0 +MAINT_VERSION=0 diff --git a/version.sh b/version.sh index b2cad877d..7f533bd29 100644 --- a/version.sh +++ b/version.sh @@ -1,4 +1,4 @@ MAJOR_VERSION=3 API_COMPAT=3 -MINOR_VERSION=git -MAINT_VERSION= +MINOR_VERSION=0-rc0 +MAINT_VERSION=0 |