X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=9a53221a8667abe2f27cb4e3974f4157dcba1234;hb=1f0485039a276ad1c2fa3d53d284e3a87940ec77;hp=02e3a88c32d832a0f1987cc0a62106a0dbe54693;hpb=2adb94db3032332ad2235aa032bb195aba89687c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 02e3a88c3..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);
 
@@ -34,6 +35,7 @@ use Cwd            qw(getcwd);
 use Exporter       qw(import);
 use File::Basename qw(basename);
 
+use make::common;
 use make::console;
 use make::utilities;
 
@@ -66,10 +68,10 @@ sub __get_socketengines {
 
 # TODO: when buildtool is done this can be mostly removed with
 #       the remainder being merged into parse_templates.
-sub __get_template_settings($$) {
+sub __get_template_settings($$$) {
 
 	# These are actually hash references
-	my ($config, $compiler) = @_;
+	my ($config, $compiler, $version) = @_;
 
 	# Start off by populating with the config
 	my %settings = %$config;
@@ -80,8 +82,7 @@ sub __get_template_settings($$) {
 	}
 
 	# Version information
-	my %version = get_version();
-	while (my ($key, $value) = each %version) {
+	while (my ($key, $value) = each %{$version}) {
 		$settings{'VERSION_' . $key} = $value;
 	}
 
@@ -93,6 +94,13 @@ sub __get_template_settings($$) {
 	return %settings;
 }
 
+sub __test_compiler($) {
+	my $compiler = shift;
+	return 0 unless run_test("`$compiler`", !system "$compiler -v >/dev/null 2>&1");
+	return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible');
+	return 1;
+}
+
 sub cmd_clean {
 	unlink CONFIGURE_CACHE_FILE;
 }
@@ -143,6 +151,8 @@ MISC OPTIONS
   --clean                       Remove the configuration cache file and start
                                 the interactive configuration wizard.
   --disable-interactive         Disables the interactive configuration wizard.
+  --distribution-label=[text]   Sets a distribution specific version label in
+                                the build configuration.
   --gid=[id|name]               Sets the group to run InspIRCd as.
   --help                        Show this message and exit.
   --socketengine=[name]         Sets the socket engine to be used. Possible
@@ -158,7 +168,7 @@ FLAGS
                                 will search for c++, g++, clang++ or icpc.
 
 If you have any problems with configuring InspIRCd then visit our IRC channel
-at irc.ChatSpike.net #InspIRCd.
+at irc.inspircd.org #InspIRCd for support.
 
 EOH
 	exit 0;
@@ -166,17 +176,19 @@ 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});
-	parse_templates(\%config, \%compiler);
-	print "Update complete!\n";
+	my %version = get_version();
+	parse_templates(\%config, \%compiler, \%version);
+	say 'Update complete!';
 	exit 0;
 }
 
-sub run_test($$) {
-	my ($what, $result) = @_;
-	print_format "Checking whether <|GREEN $what|> is available ... ";
+sub run_test($$;$) {
+	my ($what, $result, $adjective) = @_;
+	$adjective //= 'available';
+	print_format "Checking whether <|GREEN $what|> is $adjective ... ";
 	print_format $result ? "<|GREEN yes|>\n" : "<|RED no|>\n";
 	return $result;
 }
@@ -184,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";
@@ -193,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);
@@ -217,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);
 }
@@ -240,11 +252,9 @@ sub get_compiler_info($) {
 
 sub find_compiler {
 	my @compilers = qw(c++ g++ clang++ icpc);
-	foreach my $compiler (shift || @compilers) {
-		return $compiler if run_test "`$compiler`", test_file $compiler, 'compiler.cpp';
-		if ($^O eq 'darwin') {
-			return $compiler if run_test "`xcrun $compiler`", test_file "xcrun $compiler", 'compiler.cpp';
-		}
+	foreach my $compiler (shift // @compilers) {
+		return $compiler if __test_compiler $compiler;
+		return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler";
 	}
 }
 
@@ -260,16 +270,16 @@ sub get_property($$;$)
 		}
 	}
 	close(MODULE);
-	return defined $default ? $default : '';
+	return $default // '';
 }
 
-sub parse_templates($$) {
+sub parse_templates($$$) {
 
 	# These are actually hash references
-	my ($config, $compiler) = @_;
+	my ($config, $compiler, $version) = @_;
 
 	# Collect settings to be used when generating files
-	my %settings = __get_template_settings($config, $compiler);
+	my %settings = __get_template_settings($config, $compiler, $version);
 
 	# Iterate through files in make/template.
 	foreach (<make/template/*>) {
@@ -409,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);