summaryrefslogtreecommitdiff
path: root/make/common.pm
diff options
context:
space:
mode:
authorPeter Powell <petpow@saberuk.com>2015-03-21 20:04:03 +0000
committerPeter Powell <petpow@saberuk.com>2015-03-25 19:01:33 +0000
commitaae283e1dd292ace3a02809ca571a72eb06d9732 (patch)
tree78057af511efaa4b9ff3c2be9646d72c2f1c427a /make/common.pm
parentaaae660fee19a56c752bdec84da86c4b1e779af0 (diff)
Convert the build system to Perl 5.10.
Thanks to Kross for the heads up on "use feature".
Diffstat (limited to 'make/common.pm')
-rw-r--r--make/common.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/make/common.pm b/make/common.pm
index 24ef599ce..638cc668a 100644
--- a/make/common.pm
+++ b/make/common.pm
@@ -18,11 +18,12 @@
BEGIN {
- require 5.8.0;
+ require 5.10.0;
}
package make::common;
+use feature ':5.10';
use strict;
use warnings FATAL => qw(all);
@@ -33,9 +34,8 @@ our @EXPORT = qw(get_cpu_count
get_version
module_installed);
-my %version;
-
sub get_version {
+ state %version;
return %version if %version;
# Attempt to retrieve version information from src/version.sh
@@ -47,22 +47,22 @@ sub get_version {
# Attempt to retrieve missing version information from Git
chomp(my $gr = `git describe --tags 2>/dev/null`);
if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) {
- $version{MAJOR} = $1 unless defined $version{MAJOR};
- $version{MINOR} = $2 unless defined $version{MINOR};
- $version{PATCH} = $3 unless defined $version{PATCH};
+ $version{MAJOR} //= $1;
+ $version{MINOR} //= $2;
+ $version{PATCH} //= $3;
$version{LABEL} = $4 if defined $4;
}
# The user is using a stable release which does not have
# a label attached.
- $version{LABEL} = 'release' unless defined $version{LABEL};
+ $version{LABEL} //= 'release';
# If any of these fields are missing then the user has deleted the
# version file and is not running from Git. Fill in the fields with
# dummy data so we don't get into trouble with undef values later.
- $version{MAJOR} = '0' unless defined $version{MAJOR};
- $version{MINOR} = '0' unless defined $version{MINOR};
- $version{PATCH} = '0' unless defined $version{PATCH};
+ $version{MAJOR} //= '0';
+ $version{MINOR} //= '0';
+ $version{PATCH} //= '0';
return %version;
}