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 /m4 | |
| 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 'm4')
| -rw-r--r-- | m4/internal/ac-config-macro-dirs.m4 | 2 | ||||
| -rw-r--r-- | m4/mkdirp.m4 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/m4/internal/ac-config-macro-dirs.m4 b/m4/internal/ac-config-macro-dirs.m4 index 4ddcef3e9..268488357 100644 --- a/m4/internal/ac-config-macro-dirs.m4 +++ b/m4/internal/ac-config-macro-dirs.m4 @@ -1,5 +1,5 @@ # Support AC_CONFIG_MACRO_DIRS with older autoconf. -*- Autoconf -*- -# FIXME: To be removed in Automake 1.14, once we can assume autoconf +# FIXME: To be removed in Automake 2.0, once we can assume autoconf # 2.70 or later. # FIXME: keep in sync with the contents of the variable # '$ac_config_macro_dirs_fallback' in aclocal.in. diff --git a/m4/mkdirp.m4 b/m4/mkdirp.m4 index 68f44cb80..0b90d2c0a 100644 --- a/m4/mkdirp.m4 +++ b/m4/mkdirp.m4 @@ -11,7 +11,8 @@ AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl FIXME to be removed in Automake 1.14. +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. AC_DIAGNOSE([obsolete], [$0: this macro is deprecated, and will soon be removed. You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, |