X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=e88454658811c34821f9bb5511c94cde438fdd58;hb=806e57433a38193ae14942ee60f573fe47f4b643;hp=2864240808883b5ce94b4fef470d59e182d20e55;hpb=f71e6bf9cb41811f18864f5d4eecb26e29d03f25;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 286424080..e88454658 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2012 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2012-2014 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,29 +22,42 @@
 
 
 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;
-use Exporter 'import';
-
-use make::utilities;
-
-our @EXPORT = qw(cmd_clean cmd_help cmd_update
-                 read_configure_cache write_configure_cache
-                 get_compiler_info find_compiler
-                 run_test test_file test_header
-                 get_property get_revision
-                 dump_hash);
-
-my $revision;
-
-sub __get_socketengines() {
+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 constant CONFIGURE_DIRECTORY     => '.configure';
+use constant CONFIGURE_CACHE_FILE    => catfile(CONFIGURE_DIRECTORY, 'cache.cfg');
+use constant CONFIGURE_CACHE_VERSION => '1';
+
+our @EXPORT = qw(CONFIGURE_CACHE_FILE
+                 CONFIGURE_CACHE_VERSION
+                 cmd_clean
+                 cmd_help
+                 cmd_update
+                 run_test
+                 test_file
+                 test_header
+                 read_configure_cache
+                 write_configure_cache
+                 get_compiler_info
+                 find_compiler
+                 parse_templates);
+
+sub __get_socketengines {
 	my @socketengines;
 	foreach (<src/socketengines/socketengine_*.cpp>) {
 		s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/;
@@ -53,8 +66,44 @@ sub __get_socketengines() {
 	return @socketengines;
 }
 
+# TODO: when buildtool is done this can be mostly removed with
+#       the remainder being merged into parse_templates.
+sub __get_template_settings($$$) {
+
+	# These are actually hash references
+	my ($config, $compiler, $version) = @_;
+
+	# Start off by populating with the config
+	my %settings = %$config;
+
+	# Compiler information
+	while (my ($key, $value) = each %{$compiler}) {
+		$settings{'COMPILER_' . $key} = $value;
+	}
+
+	# Version information
+	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`);
+
+	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 '.config.cache';
+	unlink CONFIGURE_CACHE_FILE;
 }
 
 sub cmd_help {
@@ -85,11 +134,11 @@ PATH OPTIONS
                                 [$PWD/run/data]
   --log-dir=[dir]               The location where the log files are stored.
                                 [$PWD/run/logs]
+  --manual-dir=[dir]            The location where the manual files are stored.
+                                [$PWD/run/manuals]
   --module-dir=[dir]            The location where the loadable modules are
                                 stored.
                                 [$PWD/run/modules]
-  --build-dir=[dir]             The location to store files in while building.
-
 
 EXTRA MODULE OPTIONS
 
@@ -103,10 +152,13 @@ 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.
-  --uid=[name]                  Sets the user to run InspIRCd as.
   --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.
 
 
@@ -117,150 +169,267 @@ 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;
 }
 
 sub cmd_update {
-	unless (-f '.config.cache') {
-		print "You have not run $0 before. Please do this before trying to update the build files.\n";
-		exit 1;
-	}
-	print "Updating...\n";
-	%main::config = read_configure_cache();
-	%main::cxx = get_compiler_info($main::config{CXX});
-	$main::topdir = getcwd();
-	main::writefiles();
-	print "Update complete!\n";
+	print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f CONFIGURE_CACHE_FILE;
+	say 'Updating...';
+	my %config = read_configure_cache();
+	my %compiler = get_compiler_info($config{CXX});
+	my %version = get_version();
+	parse_templates(\%config, \%compiler, \%version);
+	say 'Update complete!';
 	exit 0;
 }
 
+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;
+}
+
+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";
+	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);
+	return !$?;
+}
+
 sub read_configure_cache {
-	my %cfg = ();
-	open(CACHE, '.config.cache') or return %cfg;
+	my %config;
+	open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
 	while (my $line = <CACHE>) {
 		next if $line =~ /^\s*($|\#)/;
-		my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
-		$cfg{$key} = $value;
+		my ($key, $value) = ($line =~ /^(\S+)(?:\s(.*))?$/);
+		$config{$key} = $value;
 	}
 	close(CACHE);
-	return %cfg;
+	return %config;
 }
 
 sub write_configure_cache(%) {
-	my %cfg = @_;
-	open(CACHE, ">.config.cache") or return 0;
-	while (my ($key, $value) = each %cfg) {
-		$value = "" unless defined $value;
-		print CACHE "$key=\"$value\"\n";
+	unless (-e CONFIGURE_DIRECTORY) {
+		print_format "Creating <|GREEN ${\CONFIGURE_DIRECTORY}|> ...\n";
+		create_directory CONFIGURE_DIRECTORY, 0750 or print_error "unable to create ${\CONFIGURE_DIRECTORY}: $!";
+	}
+
+	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 //= '';
+		say CACHE "$key $value";
 	}
 	close(CACHE);
-	return 1;
 }
 
 sub get_compiler_info($) {
 	my $binary = shift;
 	my $version = `$binary -v 2>&1`;
-	if ($version =~ /(?:clang|llvm)\sversion\s(\d+\.\d+)/i) {
-		return (
-			NAME => 'Clang',
-			VERSION => $1,
-			UNSUPPORTED => $1 lt '3.0',
-			REASON => 'Clang 2.9 and older do not have adequate C++ support.'
-		);
+	if ($version =~ /Apple\sLLVM\sversion\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 => 'AppleClang', VERSION => $1);
+	} elsif ($version =~ /clang\sversion\s(\d+\.\d+)/i) {
+		return (NAME => 'Clang', VERSION => $1);
 	} elsif ($version =~ /gcc\sversion\s(\d+\.\d+)/i) {
-		return (
-			NAME => 'GCC',
-			VERSION => $1,
-			UNSUPPORTED => $1 lt '4.1',
-			REASON => 'GCC 4.0 and older do not have adequate C++ support.'
-		);
+		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,
-			UNSUPPORTED => $2 lt '4.1',
-			REASON => "ICC $1 (GCC $2 compatibility mode) does not have adequate C++ support."
-		);
+		return (NAME => 'ICC', VERSION => $1);
 	}
-	return (
-		NAME => $binary,
-		VERSION => '0.0'
-	);
+	return (NAME => $binary, VERSION => '0.0');
 }
 
 sub find_compiler {
-	foreach my $compiler ('c++', 'g++', 'clang++', 'icpc') {
-		return $compiler unless system "$compiler -v > /dev/null 2>&1";
-		if ($^O eq 'Darwin') {
-			return $compiler unless system "xcrun $compiler -v > /dev/null 2>&1";
-		}
+	my @compilers = qw(c++ g++ clang++ icpc);
+	foreach my $compiler (shift // @compilers) {
+		return $compiler if __test_compiler $compiler;
+		return "xcrun $compiler" if $^O eq 'darwin' && __test_compiler "xcrun $compiler";
 	}
-	return "";
 }
 
-sub run_test($$) {
-	my ($what, $result) = @_;
-	print "Checking whether $what is available... ";
-	print $result ? "yes\n" : "no\n";
-	return $result;
-}
-
-sub test_file($$;$) {
-	my ($cc, $file, $args) = @_;
-	my $status = 0;
-	$args ||= '';
-	$status ||= system "$cc -o __test_$file make/test/$file $args >/dev/null 2>&1";
-	$status ||= system "./__test_$file >/dev/null 2>&1";
-	unlink  "./__test_$file";
-	return !$status;
-}
-
-sub test_header($$;$) {
-	my ($cc, $header, $args) = @_;
-	$args ||= '';
-	open(CC, "| $cc -E - $args >/dev/null 2>&1") or return 0;
-	print CC "#include <$header>";
-	close(CC);
-	return !$?;
-}
-
-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);
+sub parse_templates($$$) {
+
+	# These are actually hash references
+	my ($config, $compiler, $version) = @_;
+
+	# Collect settings to be used when generating files
+	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);
+
+		# First pass: parse template variables and directives.
+		while (my $line = <TEMPLATE>) {
+			chomp $line;
+
+			# Does this line match a variable?
+			while ($line =~ /(@(\w+?)@)/) {
+				my ($variable, $name) = ($1, $2);
+				if (defined $settings{$name}) {
+					$line =~ s/\Q$variable\E/$settings{$name}/;
+				} else {
+					print_warning "unknown template variable '$name' in $_!";
+					last;
+				}
+			}
+
+			# Does this line match a directive?
+			if ($line =~ /^\s*%(\w+)\s+(.+)$/) {
+				if ($1 eq 'define') {
+					if ($settings{$2}) {
+						push @lines, "#define $2";
+					} else {
+						push @lines, "#undef $2";
+					}
+				} elsif ($1 eq 'mode') {
+					$mode = oct $2;
+				} elsif ($1 eq 'platform') {
+					push @platforms, $2;
+				} elsif ($1 eq 'target') {
+					if ($2 =~ /(\w+)\s(.+)/) {
+						$targets{$1} = $2;
+					} else {
+						$targets{DEFAULT} = $2;
+					}
+				} else {
+					print_warning "unknown template command '$1' in $_!";
+					push @lines, $line;
+				}
+				next;
+			}
+			push @lines, $line;
+		}
+		close(TEMPLATE);
+
+		# 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} = 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;
+					}
+
+					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 $target: $!";
+				foreach (@final_lines) {
+					say TARGET $_;
+				}
+				close(TARGET);
+
+				# Set file permissions.
+				if (defined $mode) {
+					chmod $mode, $target;
+				}
+			}
 		}
 	}
-	close(MODULE);
-	return defined $default ? $default : '';
-}
-
-sub get_revision {
-	return $revision if defined $revision;
-	chomp(my $tags = `git describe --tags 2>/dev/null`);
-	$revision = $tags || 'release';
-	return $revision;
-}
-
-sub dump_hash()
-{
-	print "\n\e[1;32mPre-build configuration is complete!\e[0m\n\n";
-	print "\e[0mBase install path:\e[1;32m\t\t$main::config{BASE_DIR}\e[0m\n";
-	print "\e[0mConfig path:\e[1;32m\t\t\t$main::config{CONFIG_DIR}\e[0m\n";
-	print "\e[0mData path:\e[1;32m\t\t\t$main::config{DATA_DIR}\e[0m\n";
-	print "\e[0mLog path:\e[1;32m\t\t\t$main::config{LOG_DIR}\e[0m\n";
-	print "\e[0mModule path:\e[1;32m\t\t\t$main::config{MODULE_DIR}\e[0m\n";
-	print "\e[0mCompiler:\e[1;32m\t\t\t$main::cxx{NAME} $main::cxx{VERSION}\e[0m\n";
-	print "\e[0mSocket engine:\e[1;32m\t\t\t$main::config{SOCKETENGINE}\e[0m\n";
-	print "\e[0mGnuTLS support:\e[1;32m\t\t\t$main::config{USE_GNUTLS}\e[0m\n";
-	print "\e[0mOpenSSL support:\e[1;32m\t\t$main::config{USE_OPENSSL}\e[0m\n";
 }
 
 1;