[interchange] Add back in commit counter, some cleanup/logic documentation
David Christensen <[email protected]> Fri, 03 Nov 2017 19:11:48 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit b90cef090d7bf807d9591b5c694d1dc21e5b83ce Author: David Christensen <[email protected]> Date: Fri Nov 3 14:11:43 2017 -0500 Add back in commit counter, some cleanup/logic documentation Makefile.PL | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) --- diff --git a/Makefile.PL b/Makefile.PL index babd088..7de893b 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -731,7 +731,13 @@ sub get_dist_version { # standardize tagged releases; 2 valid formats here: REL_5_X_X and 5.X.X if ($vers =~ /^REL_(\d+)_(\d+)_(\d+)(-(\d+)-g(\w+))?/ || /^(\d+)\.(\d+)\.(\d+)(-(\d+)-g(\w+))?/ ) { if ($4) { - $vers = sprintf '%d.%d.%d-devel-%s', $1, $2 + ($is_stable ? 0 : 1), ($is_stable ? $3 + 1 : 0), $6; + $vers = sprintf '%d.%d.%d-devel-%d-%s', + $1, # major + $2 + ($is_stable ? 0 : 1), # minor (increasing if we're not on a stable branch) + ($is_stable ? $3 + 1 : 0), # patch (increasing if we *are* on a stable branch, 0 if minor increased) + $5, # commit counter + $6 # abbrev git hash + ; } else { $vers = "$1.$2.$3";