From c1f94f5684596a12bd3d3a0de184512cb010b959 Mon Sep 17 00:00:00 2001 From: Vladimir Sokolovsky Date: Sun, 31 May 2015 13:17:51 +0300 Subject: [PATCH] Change release version format Signed-off-by: Vladimir Sokolovsky --- build.pl | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/build.pl b/build.pl index 7090f50..2524ca7 100755 --- a/build.pl +++ b/build.pl @@ -309,11 +309,15 @@ sub get_from_git close IN; $packages{$name}{'version'} = (split '-',$version)[0]; - my $rel = 0; - if ((split '-',$version)[1]) { - $rel = (split '-',$version)[1]; + $packages{$name}{'release'} = ''; + + if ($build_release) { + my $rel = 0; + if ((split '-',$version)[1]) { + $rel = (split '-',$version)[1]; + } + $packages{$name}{'release'} = $rel . '.' if ($rel); } - $packages{$name}{'release'} = $rel . '.'; $packages{$name}{'release'} .= $build_version; if (not $build_release) { @@ -338,11 +342,15 @@ sub get_from_git ex "$GIT checkout $ref"; update_build_id($name, "$packages{$name}{'git_url'} $packages{$name}{'git_branch'}\n" . `git log -1 | head -1`); - my $rel = 0; - if ((split '-',$version)[1]) { - $rel = (split '-',$version)[1]; + $packages{$name}{'release'} = ''; + + if ($build_release) { + my $rel = 0; + if ((split '-',$version)[1]) { + $rel = (split '-',$version)[1]; + } + $packages{$name}{'release'} = $rel . '.' if ($rel); } - $packages{$name}{'release'} = $rel . '.'; $packages{$name}{'release'} .= $build_version; if (not $build_release) { -- 2.46.0