Mailing List Archive

commit 77c7d591eeb6ba30d4c5b50cf12790ad46a7663c
Author: David Christensen <david@endpoint.com>
Date: Fri Nov 3 10:49:35 2017 -0500

Update get_dist_version() to consider any post-tag commits as being on devel branch

Makefile.PL | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.PL b/Makefile.PL
index ca089a9..3828838 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -720,19 +720,21 @@ EOF
sub get_dist_version {
my $vers = $VERSION;
if (-d "./.git") {
- $vers = qx(git describe --tags --dirty);
+ $vers = qx(git describe --tags);
chomp $vers;
}
- # XXX do we want to increment revision number if we're not a tagged release,
- # so anything tagged after 5.12 will display as 5.13 for devel release?
-
# standardize/handle old tagged REL tags
if ($vers =~ /^REL_(\d+)_(\d+)_(\d+)(-(\d+)-g(\w+))/) {
- $vers = "$1.$2.$3";
- $vers .= '-devel-' . $6 if $4;
+ if ($4) {
+ $vers = sprintf '%d.%d.%d', $1, $2 + 1, 0;
+ $vers .= '-devel-' . $6 if $4;
+ }
+ else {
+ $vers = "$1.$2.$3";
+ }
}
elsif ($vers =~ /^(\d+)\.(\d+)\.(\d+)(-(\d+)-g(\w+))/) {
- $vers = "$1.$2.$3-devel-$6";
+ $vers = sprintf '%d.%d.%d-devel-%s', $1, $2 + 1, 0, $6;
}
else {
# assuming this is \d+.\d+.\d+ for new tagging scenario

_______________________________________________
interchange-cvs mailing list
interchange-cvs@icdevgroup.org
http://www.icdevgroup.org/mailman/listinfo/interchange-cvs