From aae283e1dd292ace3a02809ca571a72eb06d9732 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 21 Mar 2015 20:04:03 +0000 Subject: Convert the build system to Perl 5.10. Thanks to Kross for the heads up on "use feature". --- tools/test-build | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'tools/test-build') diff --git a/tools/test-build b/tools/test-build index 1b0192e31..b0eb255c0 100755 --- a/tools/test-build +++ b/tools/test-build @@ -19,13 +19,14 @@ BEGIN { - require 5.8.0; + require 5.10.0; unless (-f 'configure') { print "Error: $0 must be run from the main source directory!\n"; exit 1; } } +use feature ':5.10'; use strict; use warnings FATAL => qw(all); @@ -39,7 +40,7 @@ system 'git', 'clean', '-dfx'; my @compilers = $#ARGV >= 0 ? @ARGV : qw(g++ clang++ icpc); foreach my $compiler (@compilers) { if (system "$compiler -v > /dev/null 2>&1") { - print "Skipping $compiler as it is not installed on this system!\n"; + say "Skipping $compiler as it is not installed on this system!"; next; } $ENV{CXX} = $compiler; @@ -49,23 +50,23 @@ foreach my $compiler (@compilers) { push @socketengines, 'poll' if test_header $compiler, 'poll.h'; push @socketengines, 'ports' if test_header $compiler, 'ports.h'; foreach my $socketengine (@socketengines) { - print "Attempting to build using the $compiler compiler and the $socketengine socket engine...\n"; + say "Attempting to build using the $compiler compiler and the $socketengine socket engine..."; system './configure', '--enable-extras', $ENV{TEST_BUILD_MODULES} if defined $ENV{TEST_BUILD_MODULES}; if (system './configure', '--development', '--socketengine', $socketengine) { - print "Failed to configure using the $compiler compiler and the $socketengine socket engine!\n"; + say "Failed to configure using the $compiler compiler and the $socketengine socket engine!"; exit 1; } $ENV{PURE_STATIC} = 1; if (system 'make', '-j'.get_cpu_count, 'install') { - print "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!\n"; + say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!"; exit 1; } delete $ENV{PURE_STATIC}; if (system 'make', '-j'.get_cpu_count, 'install') { - print "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!\n"; + say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!"; exit 1; } - print "Building using the $compiler compiler and the $socketengine socket engine succeeded!\n"; + say "Building using the $compiler compiler and the $socketengine socket engine succeeded!"; } system 'git', 'clean', '-dfx'; -- cgit v1.2.3