[beast: 2/7] BUILD: configure.ac: verify ABI_MICRO==0



commit 6e87843cfe7b64b0303528f35b9ce7cdba87da97
Author: Tim Janik <timj gnu org>
Date:   Wed Apr 6 00:45:37 2016 +0200

    BUILD: configure.ac: verify ABI_MICRO==0
    
    With the new versioning scheme, MAJOR increments force ABI breaks,
    MINOR increments may break or preserve ABI and MICRO increments
    cannot break ABI. The check for this last bit was missing.
    
    Signed-off-by: Tim Janik <timj gnu org>

 configure.ac |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c8eb6de..012085d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,11 +11,11 @@ m4_include(autotools/glib-gettext.m4)
 #
 AC_PREREQ(2.57)
 # VERSION: MAJOR.MINOR.MICRO-RC:
-# * MICRO:           Increment with every release
-# * MINOR:           Increment for significant changes or ABI breaks, reset MICRO on increments
+# * MAJOR:           Increment on major API breaks, *forces* ABI break, resets MINOR, MICRO and ABI_VERSION
+# * MINOR:           Increment for significant changes or ABI breaks, resets MICRO
+# * MICRO:           Increment with every release, increments must *not* break ABI
 # * ABI_VERSION:     Record the latest version since ABI compatibility has been kept
-# * MAJOR:           Increment on major API breaks, enforces ABI breaks, reset MINOR, MICRO and ABI_VERSION
-# * ABI changes:     Reset ABI_VERSION to the current VERSION
+# * ABI changes:     Increment MAJOR or MINOR and reset ABI_VERSION to the current VERSION
 # * -RC:             Release candidate, may contain -rc[0-9]+ or nothing
 AC_INIT([beast], [0.9.3]) # defines PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_STRING
 :;   ABI_VERSION=[0.9.3]
@@ -53,8 +53,8 @@ test "$ABI_MAJOR" = "$MAJOR" || {
 test "$ABI_MINOR" -le "$MINOR" || {
   AC_MSG_ERROR([ABI_VERSION must predate MINOR version: $ABI_MINOR <= $MINOR])
 }
-test "$ABI_MICRO" -le "$MICRO" -o "$ABI_MINOR" -lt "$MINOR" || {
-  AC_MSG_ERROR([ABI_VERSION must predate MINOR.MICRO version: $ABI_MINOR.$ABI_MICRO <= $MINOR.$MICRO])
+test "$ABI_MICRO" -eq 0 || {
+  AC_MSG_ERROR([ABI_VERSION must not indicate ABI break in MICRO releases: $ABI_MINOR.$ABI_MICRO <= 
$MINOR.0])
 }
 ABI_AGE=$(($MINOR - $ABI_MINOR))
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]