diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-17 10:25:29 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-17 15:33:18 +0100 |
| commit | 97aaf121e92767dc06385d020dd30cdfaa86126f (patch) | |
| tree | ed486f3ece267e2e7769b7cc12d666854498f9c5 /t | |
| parent | 24dbfd93188d5302545d55b59a3853b2115a982e (diff) | |
| download | automake-97aaf121e92767dc06385d020dd30cdfaa86126f.tar.gz | |
maint: describe new versioning and branching scheme, and adjust to it
See discussion about automake bug#13578 for more details and background.
Basically, for the versioning scheme:
- micro versions only for bug and regression fixing;
- minor versions for new backward-compatible features, and new
non-fatal deprecations;
- major versions for backward-incompatibilities, complex new
features, and major refactoring.
And for the git branching scheme:
+ branch 'next' is for the upcoming major version;
+ branch 'master' is now for the upcoming minor version;
+ branch 'maint' is for the upcoming micro (bug-fixing) version;
+ the merging hierarchy is: 'maint' -> 'master' -> 'next'.
* HACKING (Automake versioning and compatibility scheme): New.
(Working with git): Adjust.
* NEWS: Update and fix.
* aclocal.in: Adjust some "FIXME" messages.
* automake.in: Likewise.
* m4/mkdirp.m4: Likewise.
* t/aclocal-acdir.sh: Likewise.
* t/aclocal-macrodir.tap: Likewise.
* t/aclocal-macrodirs.tap: Likewise.
* lib/Automake/Options.pm: Likewise.
* m4/internal/ac-config-macro-dirs.m4: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/aclocal-acdir.sh | 2 | ||||
| -rwxr-xr-x | t/aclocal-macrodir.tap | 2 | ||||
| -rwxr-xr-x | t/aclocal-macrodirs.tap | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh index 7fbb27a2e..80eba3126 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -21,7 +21,7 @@ . test-init.sh mkdir am sys -# FIXME: remove in Automake 1.14. +# FIXME: remove in Automake 2.0 mkdir am/internal : > am/internal/ac-config-macro-dirs.m4 diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap index 3c66e530c..44af05fa9 100755 --- a/t/aclocal-macrodir.tap +++ b/t/aclocal-macrodir.tap @@ -174,7 +174,7 @@ test_end #--------------------------------------------------------------------------- # Avoid spurious failures with pre-2.70 autoconf. -# FIXME: remove this in automake 1.14, once we require Autoconf 2.70. +# FIXME: remove this in automake 2.0, once we require Autoconf 2.70. if echo 'AC_INIT AC_CONFIG_MACRO_DIRS' | $AUTOCONF -o/dev/null -; then test_begin "AC_CONFIG_MACRO_DIR interaction with AC_REQUIRE" diff --git a/t/aclocal-macrodirs.tap b/t/aclocal-macrodirs.tap index 89e424d46..ac594bb6a 100755 --- a/t/aclocal-macrodirs.tap +++ b/t/aclocal-macrodirs.tap @@ -373,7 +373,7 @@ test_end #--------------------------------------------------------------------------- # Avoid spurious failures with pre-2.70 autoconf. -# FIXME: remove this in automake 1.14, once we require Autoconf 2.70. +# FIXME: remove this in automake 2.0, once we require Autoconf 2.70. if echo 'AC_INIT AC_CONFIG_MACRO_DIRS' | $AUTOCONF -o/dev/null -; then test_begin "AC_CONFIG_MACRO_DIRS interaction with AC_REQUIRE" |