diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/genssl | 22 | ||||
| -rwxr-xr-x | tools/test-build | 15 |
2 files changed, 20 insertions, 17 deletions
diff --git a/tools/genssl b/tools/genssl index 13b1f01fc..739f7fc7d 100755 --- a/tools/genssl +++ b/tools/genssl @@ -21,9 +21,10 @@ BEGIN { - require 5.8.0; + require 5.10.0; } +use feature ':5.10'; use strict; use warnings FATAL => qw(all); @@ -36,15 +37,15 @@ use File::Temp(); sub prompt($$) { my ($question, $default) = @_; return prompt_string(1, $question, $default) if eval 'use make::console; 1'; - print "$question\n"; + say $question; print "[$default] => "; chomp(my $answer = <STDIN>); - print "\n"; + say ''; return $answer ? $answer : $default; } if ($#ARGV != 0 || $ARGV[0] !~ /^(?:auto|gnutls|openssl)$/i) { - print "Syntax: genssl <auto|gnutls|openssl>\n"; + say 'Syntax: genssl <auto|gnutls|openssl>'; exit 1; } @@ -65,14 +66,14 @@ if ($tool eq 'auto') { } elsif ($has_openssl) { $tool = 'openssl'; } else { - print STDERR "SSL generation failed: could not find $certtool or openssl in the PATH!\n"; + say STDERR "SSL generation failed: could not find $certtool or openssl in the PATH!"; exit 1; } } elsif ($tool eq 'gnutls' && !$has_gnutls) { - print STDERR "SSL generation failed: could not find '$certtool' in the PATH!\n"; + say STDERR "SSL generation failed: could not find '$certtool' in the PATH!"; exit 1; } elsif ($tool eq 'openssl' && !$has_openssl) { - print STDERR "SSL generation failed: could not find 'openssl' in the PATH!\n"; + say STDERR 'SSL generation failed: could not find \'openssl\' in the PATH!'; exit 1; } @@ -138,13 +139,14 @@ __OPENSSL_END__ } if ($status) { - print STDERR "SSL generation failed: $tool exited with a non-zero status!\n"; + say STDERR "SSL generation failed: $tool exited with a non-zero status!"; exit 1; } if (defined $dercert && eval 'use Digest::SHA; 1') { my $hash = Digest::SHA->new(256); $hash->add($dercert); - print "\nAdd this TLSA record to your domain for DANE support:\n"; - print "_6697._tcp." . $common_name . " TLSA 3 0 1 " . $hash->hexdigest . "\n"; + say ''; + say 'Add this TLSA record to your domain for DANE support:'; + say "_6697._tcp." . $common_name . " TLSA 3 0 1 " . $hash->hexdigest; } 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'; |