diff --git a/utils/version.pl b/utils/version.pl index 4a0c6ffc1..614598d5c 100644 --- a/utils/version.pl +++ b/utils/version.pl @@ -6,8 +6,8 @@ use warnings; use Data::Dumper; # Version changes: -# v[x].[y].[z] -- Main version number -# v[x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number +# [x].[y].[z] -- Main version number +# [x].[y].[z]-test-[branchstring]-[num] -- test/branch/devel version number # on main/master: Biggest version so far, increment by occuring changes # on other branches: find version; be it branch string, old format or main version number; # increments from there. Increment version number, but on global conflict use new version number @@ -288,7 +288,7 @@ sub vsCompare { #for($v, $w) { # $_ = parseVersion($_) unless ref $_; #} - if('v' eq $v->{prefix} and 'v' eq $w->{prefix}) { + if($v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) { return( ($v->{major} // 0) <=> ($w->{major} // 0) || ($v->{minor} // 0) <=> ($w->{minor} // 0) || @@ -297,9 +297,9 @@ sub vsCompare { ($v->{branchversion} // 0) <=> ($w->{branchversion} // 0) || ($v->{subpatch} // '') cmp ($w->{subpatch} // '') ) - } elsif('v' eq $v->{prefix} and 'v' ne $w->{prefix}) { + } elsif($v->{prefix}=~m/^v?$/ and !$w->{prefix}=~m/^v?$/) { return 1; - } elsif('v' ne $v->{prefix} and 'v' eq $w->{prefix}) { + } elsif(!$v->{prefix}=~m/^v?$/ and $w->{prefix}=~m/^v?$/) { return -1; } else { return vsStringDebug($v) cmp vsStringDebug($w) @@ -385,7 +385,7 @@ VERSION: for my $v(@versions) { # $tag=$1; # last VERSION #} - if($v->{meta}=~m#tag\s*:\s*([vtd]b?[0-9\.]+(?:-.*)?)\)#) { + if($v->{meta}=~m#tag\s*:\s*((?:[vtd]|db|)[0-9\.]+(?:-.*)?)\)#) { $v->{version} = $1; push @versionPast, $v->{version} } @@ -479,7 +479,7 @@ sub justVersionInc { my $newVersion = undef; if($mainVersion) { - $newVersion = "v" . justVersionInc($highStart, \%reactCollect); + $newVersion = justVersionInc($highStart, \%reactCollect); } else { my $v = parseVersion($highStart); if(exists $v->{branchname}) { @@ -589,7 +589,7 @@ if($par{changelog}) { my $preVersion = ''; if(defined $sects[0] and defined $sects[0][0] and $sects[0][0]=~m/^##\s*\[([^\]\[]+)\]\(/) { $preVersion = $1; - $preVersion =~ s#^v?#v#; + # $preVersion =~ s#^v?#v#; } my $today = do { my @time = localtime; @@ -618,11 +618,3 @@ All notable changes to this project will be documented in this file. See [standa - - - - - - - -