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

diff --git a/make/configure.pm b/make/configure.pm
index 02e3a88c3..dfdbf5f75 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2012-2014 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2012-2017 Peter Powell <petpow@saberuk.com>
 #   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
 #   Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
 #   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
@@ -22,23 +22,27 @@
 
 
 BEGIN {
-	require 5.8.0;
+	require 5.10.0;
 }
 
 package make::configure;
 
+use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
-use Cwd            qw(getcwd);
-use Exporter       qw(import);
-use File::Basename qw(basename);
+use Cwd                   qw(getcwd);
+use Exporter              qw(import);
+use File::Basename        qw(basename dirname);
+use File::Spec::Functions qw(catfile);
 
+use make::common;
 use make::console;
-use make::utilities;
 
-use constant CONFIGURE_CACHE_FILE    => '.configure.cache';
+use constant CONFIGURE_DIRECTORY     => '.configure';
+use constant CONFIGURE_CACHE_FILE    => catfile(CONFIGURE_DIRECTORY, 'cache.cfg');
 use constant CONFIGURE_CACHE_VERSION => '1';
+use constant CONFIGURE_ERROR_PIPE    => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/null 2>/dev/null';
 
 our @EXPORT = qw(CONFIGURE_CACHE_FILE
                  CONFIGURE_CACHE_VERSION
@@ -48,11 +52,9 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
                  run_test
                  test_file
                  test_header
-                 read_configure_cache
                  write_configure_cache
                  get_compiler_info
                  find_compiler
-                 get_property
                  parse_templates);
 
 sub __get_socketengines {
@@ -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,12 +82,12 @@ 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;
 	}
 
 	# Miscellaneous information
+	$settings{CONFIGURE_DIRECTORY} = CONFIGURE_DIRECTORY;
 	$settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE;
 	$settings{SYSTEM_NAME} = lc $^O;
 	chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`);
@@ -93,6 +95,13 @@ sub __get_template_settings($$) {
 	return %settings;
 }
 
+sub __test_compiler($) {
+	my $compiler = shift;
+	return 0 unless run_test("`$compiler`", !system "$compiler -v ${\CONFIGURE_ERROR_PIPE}");
+	return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible');
+	return 1;
+}
+
 sub cmd_clean {
 	unlink CONFIGURE_CACHE_FILE;
 }
@@ -143,12 +152,15 @@ 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
                                 values are $SELIST.
   --uid=[id|name]               Sets the user to run InspIRCd as.
-  --update                      Updates the build environment.
+  --update                      Updates the build environment with the settings
+                                from the cache.
 
 
 FLAGS
@@ -158,7 +170,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 +178,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";
-	my %config = read_configure_cache();
+	say 'Updating...';
+	my %config = read_config_file(CONFIGURE_CACHE_FILE);
 	my %compiler = get_compiler_info($config{CXX});
-	parse_templates(\%config, \%compiler);
-	print "Update complete!\n";
+	my %version = get_version $config{DISTRIBUTION};
+	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,101 +198,70 @@ sub run_test($$) {
 sub test_file($$;$) {
 	my ($compiler, $file, $args) = @_;
 	my $status = 0;
-	$args ||= '';
-	$status ||= system "$compiler -o __test_$file make/test/$file $args >/dev/null 2>&1";
-	$status ||= system "./__test_$file >/dev/null 2>&1";
+	$args //= '';
+	$status ||= system "$compiler -o __test_$file make/test/$file $args ${\CONFIGURE_ERROR_PIPE}";
+	$status ||= system "./__test_$file ${\CONFIGURE_ERROR_PIPE}";
 	unlink "./__test_$file";
 	return !$status;
 }
 
 sub test_header($$;$) {
 	my ($compiler, $header, $args) = @_;
-	$args ||= '';
-	open(COMPILER, "| $compiler -E - $args >/dev/null 2>&1") or return 0;
-	print COMPILER "#include <$header>";
-	close(COMPILER);
+	$args //= '';
+	open(my $fh, "| $compiler -E - $args ${\CONFIGURE_ERROR_PIPE}") or return 0;
+	print $fh "#include <$header>";
+	close $fh;
 	return !$?;
 }
 
-sub read_configure_cache {
-	my %config;
-	open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
-	while (my $line = <CACHE>) {
-		next if $line =~ /^\s*($|\#)/;
-		my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
-		$config{$key} = $value;
+sub write_configure_cache(%) {
+	unless (-e CONFIGURE_DIRECTORY) {
+		print_format "Creating <|GREEN ${\CONFIGURE_DIRECTORY}|> ...\n";
+		create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
 	}
-	close(CACHE);
-	return %config;
-}
 
-sub write_configure_cache(%) {
 	print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n";
 	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";
-	}
-	close(CACHE);
+	write_config_file CONFIGURE_CACHE_FILE, %config;
 }
 
 sub get_compiler_info($) {
 	my $binary = shift;
-	my $version = `$binary -v 2>&1`;
-	if ($version =~ /clang\sversion\s(\d+\.\d+)/i || $version =~ /^apple.+\(based\son\sllvm\s(\d+\.\d+)/i) {
-		# Apple version their LLVM releases slightly differently to the mainline LLVM.
-		# See https://trac.macports.org/wiki/XcodeVersionInfo for more information.
-		return (NAME => 'Clang', VERSION => $1);
-	} elsif ($version =~ /gcc\sversion\s(\d+\.\d+)/i) {
-		return (NAME => 'GCC', VERSION => $1);
-	} elsif ($version =~ /(?:icc|icpc)\sversion\s(\d+\.\d+).\d+\s\(gcc\sversion\s(\d+\.\d+).\d+/i) {
-		return (NAME => 'ICC', VERSION => $1);
+	my %info = (NAME => 'Unknown', VERSION => '0.0');
+	return %info if system "$binary -o __compiler_info make/test/compiler_info.cpp ${\CONFIGURE_ERROR_PIPE}";
+	open(my $fh, '-|', './__compiler_info 2>/dev/null');
+	while (my $line = <$fh>) {
+		$info{$1} = $2 if $line =~ /^([A-Z]+)\s(.+)$/;
 	}
-	return (NAME => $binary, VERSION => '0.0');
+	close $fh;
+	unlink './__compiler_info';
+	return %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";
 	}
 }
 
-sub get_property($$;$)
-{
-	my ($file, $property, $default) = @_;
-	open(MODULE, $file) or return $default;
-	while (<MODULE>) {
-		if ($_ =~ /^\/\* \$(\S+): (.+) \*\/$/) {
-			next unless $1 eq $property;
-			close(MODULE);
-			return translate_functions($2, $file);
-		}
-	}
-	close(MODULE);
-	return defined $default ? $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/*>) {
 		print_format "Parsing <|GREEN $_|> ...\n";
-		open(TEMPLATE, $_) or print_error "unable to read $_: $!";
-		my (@lines, $mode, @platforms, %targets);
+		open(my $fh, $_) or print_error "unable to read $_: $!";
+		my (@lines, $mode, @platforms, @targets);
 
 		# First pass: parse template variables and directives.
-		while (my $line = <TEMPLATE>) {
+		while (my $line = <$fh>) {
 			chomp $line;
 
 			# Does this line match a variable?
@@ -305,11 +288,7 @@ sub parse_templates($$) {
 				} elsif ($1 eq 'platform') {
 					push @platforms, $2;
 				} elsif ($1 eq 'target') {
-					if ($2 =~ /(\w+)\s(.+)/) {
-						$targets{$1} = $2;
-					} else {
-						$targets{DEFAULT} = $2;
-					}
+					push @targets, $2
 				} else {
 					print_warning "unknown template command '$1' in $_!";
 					push @lines, $line;
@@ -318,100 +297,33 @@ sub parse_templates($$) {
 			}
 			push @lines, $line;
 		}
-		close(TEMPLATE);
+		close $fh;
 
 		# Only proceed if this file should be templated on this platform.
 		if ($#platforms < 0 || grep { $_ eq $^O } @platforms) {
 
 			# Add a default target if the template has not defined one.
-			unless (scalar keys %targets) {
-				$targets{DEFAULT} = basename $_;
+			unless (@targets) {
+				push @targets, catfile(CONFIGURE_DIRECTORY, basename $_);
 			}
 
-			# Second pass: parse makefile junk and write files.
-			while (my ($name, $target) = each %targets) {
-
-				# TODO: when buildtool is done this mess can be removed completely.
-				my @final_lines;
-				foreach my $line (@lines) {
-
-					# Are we parsing a makefile and does this line match a statement?
-					if ($name =~ /(?:BSD|GNU)_MAKE/ && $line =~ /^\s*\@(\w+)(?:\s+(.+))?$/) {
-						my @tokens = split /\s/, $2 if defined $2;
-						if ($1 eq 'DO_EXPORT' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								foreach my $variable (@tokens) {
-									push @final_lines, "MAKEENV += $variable='\${$variable}'";
-								}
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "export $2";
-							}
-						} elsif ($1 eq 'ELSE') {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".else";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "else";
-							}
-						} elsif ($1 eq 'ENDIF') {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".endif";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "endif";
-							}
-						} elsif ($1 eq 'ELSIFEQ' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".elif $tokens[0] == $tokens[1]";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "else ifeq ($tokens[0], $tokens[1])";
-							}
-						} elsif ($1 eq 'IFDEF' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".if defined($2)";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "ifdef $2";
-							}
-						} elsif ($1 eq 'IFEQ' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".if $tokens[0] == $tokens[1]";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "ifeq ($tokens[0],$tokens[1])";
-							}
-						} elsif ($1 eq 'IFNEQ' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".if $tokens[0] != $tokens[1]";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "ifneq ($tokens[0],$tokens[1])";
-							}
-						} elsif ($1 eq 'IFNDEF' && defined $2) {
-							if ($name eq 'BSD_MAKE') {
-								push @final_lines, ".if !defined($2)";
-							} elsif ($name eq 'GNU_MAKE') {
-								push @final_lines, "ifndef $2";
-							}
-						} elsif ($1 eq 'TARGET' && defined $2) {
-							if ($tokens[0] eq $name) {
-								push @final_lines, substr($2, length($tokens[0]) + 1);
-							}
-						} elsif ($1 !~ /[A-Z]/) {
-							# HACK: silently ignore if lower case as these are probably make commands.
-							push @final_lines, $line;
-						} else {
-							print_warning "unknown template command '$1' in $_!";
-							push @final_lines, $line;
-						}
-						next;
-					}
+			# Write the templated files to disk.
+			for my $target (@targets) {
 
-					push @final_lines, $line;
-				}
+				# Create the directory if it doesn't already exist.
+				my $directory = dirname $target;
+				unless (-e $directory) {
+					print_format "Creating <|GREEN $directory|> ...\n";
+					create_directory $directory, 0750 or print_error "unable to create $directory: $!";
+				};
 
 				# Write the template file.
 				print_format "Writing <|GREEN $target|> ...\n";
-				open(TARGET, '>', $target) or print_error "unable to write $_: $!";
-				foreach (@final_lines) {
-					print TARGET $_, "\n";
+				open(my $fh, '>', $target) or print_error "unable to write $target: $!";
+				foreach (@lines) {
+					say $fh $_;
 				}
-				close(TARGET);
+				close $fh;
 
 				# Set file permissions.
 				if (defined $mode) {