Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta.pm: Use decimal versions for generated version numbers, making dotted-integer versions / semver optional.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18872 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-03-12 08:34:36 +00:00
parent d926be1d46
commit 9abbc70bbc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
FHEM/Meta.pm
View File

@ -1032,7 +1032,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
# seems the author didn't put any explicit # seems the author didn't put any explicit
# version number we could find ... # version number we could find ...
else { else {
$modMeta->{version} = "v0.0."; $modMeta->{version} = '0.';
if ( defined( $modMeta->{x_vcs} ) if ( defined( $modMeta->{x_vcs} )
&& $modMeta->{x_vcs}[5] ne '' ) && $modMeta->{x_vcs}[5] ne '' )
@ -1044,7 +1044,7 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
# we don't know anything about this module at all # we don't know anything about this module at all
else { else {
$versionFrom = 'generated/blank'; $versionFrom = 'generated/blank';
$modMeta->{version} .= '0'; $modMeta->{version} .= '.0';
} }
} }
@ -1058,7 +1058,8 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
$@ .= $@ .=
$modMeta->{x_file}[2] . ": Invalid version format '$modMeta->{version}'" $modMeta->{x_file}[2] . ": Invalid version format '$modMeta->{version}'"
if ( defined( $modMeta->{version} ) if ( defined( $modMeta->{version} )
&& $modMeta->{version} !~ m/^v\d+\.\d+\.\d+$/ ); && $modMeta->{version} !~ m/^v\d+\.\d+(?:\.\d+)*$/
&& $modMeta->{version} !~ m/^\d+\.\d+$/ );
# meta name # meta name
unless ( defined( $modMeta->{name} ) ) { unless ( defined( $modMeta->{name} ) ) {