diff options
author | Peter Powell <petpow@saberuk.com> | 2015-03-21 20:04:03 +0000 |
---|---|---|
committer | Peter Powell <petpow@saberuk.com> | 2015-03-25 19:01:33 +0000 |
commit | aae283e1dd292ace3a02809ca571a72eb06d9732 (patch) | |
tree | 78057af511efaa4b9ff3c2be9646d72c2f1c427a /make/configure.pm | |
parent | aaae660fee19a56c752bdec84da86c4b1e779af0 (diff) |
Convert the build system to Perl 5.10.
Thanks to Kross for the heads up on "use feature".
Diffstat (limited to 'make/configure.pm')
-rw-r--r-- | make/configure.pm | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/make/configure.pm b/make/configure.pm index 84f076483..9a53221a8 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -22,11 +22,12 @@ BEGIN { - require 5.8.0; + require 5.10.0; } package make::configure; +use feature ':5.10'; use strict; use warnings FATAL => qw(all); @@ -175,18 +176,18 @@ EOH sub cmd_update { print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f CONFIGURE_CACHE_FILE; - print "Updating...\n"; + say 'Updating...'; my %config = read_configure_cache(); my %compiler = get_compiler_info($config{CXX}); my %version = get_version(); parse_templates(\%config, \%compiler, \%version); - print "Update complete!\n"; + say 'Update complete!'; exit 0; } sub run_test($$;$) { my ($what, $result, $adjective) = @_; - $adjective ||= 'available'; + $adjective //= 'available'; print_format "Checking whether <|GREEN $what|> is $adjective ... "; print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n"; return $result; @@ -195,7 +196,7 @@ sub run_test($$;$) { sub test_file($$;$) { my ($compiler, $file, $args) = @_; my $status = 0; - $args ||= ''; + $args //= ''; $status ||= system "$compiler -o __test_$file make/test/$file $args >/dev/null 2>&1"; $status ||= system "./__test_$file >/dev/null 2>&1"; unlink "./__test_$file"; @@ -204,7 +205,7 @@ sub test_file($$;$) { sub test_header($$;$) { my ($compiler, $header, $args) = @_; - $args ||= ''; + $args //= ''; open(COMPILER, "| $compiler -E - $args >/dev/null 2>&1") or return 0; print COMPILER "#include <$header>"; close(COMPILER); @@ -228,8 +229,8 @@ sub write_configure_cache(%) { my %config = @_; open(CACHE, '>', CONFIGURE_CACHE_FILE) or print_error "unable to write ${\CONFIGURE_CACHE_FILE}: $!"; while (my ($key, $value) = each %config) { - $value = '' unless defined $value; - print CACHE "$key=\"$value\"\n"; + $value //= ''; + say CACHE "$key=\"$value\""; } close(CACHE); } @@ -251,7 +252,7 @@ sub get_compiler_info($) { sub find_compiler { my @compilers = qw(c++ g++ clang++ icpc); - foreach my $compiler (shift || @compilers) { + foreach my $compiler (shift // @compilers) { return $compiler if __test_compiler $compiler; return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler"; } @@ -269,7 +270,7 @@ sub get_property($$;$) } } close(MODULE); - return defined $default ? $default : ''; + return $default // ''; } sub parse_templates($$$) { @@ -418,7 +419,7 @@ sub parse_templates($$$) { print_format "Writing <|GREEN $target|> ...\n"; open(TARGET, '>', $target) or print_error "unable to write $_: $!"; foreach (@final_lines) { - print TARGET $_, "\n"; + say TARGET $_; } close(TARGET); |