X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make%2Fconfigure.pm;h=48bd8db3842a445d352f79a7236f240261a11c74;hb=9207f3f1ce0f1c7d7dc9af522e063017d38f7b5f;hp=95499720f539b4f7fcae4ffe694fd6df21018965;hpb=77a08e490c340ffeca089fb15043490f1ce4b7de;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index 95499720f..48bd8db38 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -1,7 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2012 Peter Powell +# Copyright (C) 2012-2017 Peter Powell # Copyright (C) 2008 Robin Burchell # Copyright (C) 2007-2008 Craig Edwards # Copyright (C) 2008 Thomas Stagner @@ -21,336 +21,395 @@ # -package make::configure; +BEGIN { + require 5.10.0; +} -require 5.8.0; +package make::configure; +use feature ':5.10'; use strict; use warnings FATAL => qw(all); -use Exporter 'import'; -use POSIX; -use make::utilities; -our @EXPORT = qw(get_compiler_info find_compiler test_file test_header promptnumeric dumphash is_dir getmodules getrevision getcompilerflags getlinkerflags getdependencies nopedantic resolve_directory yesno showhelp promptstring_s module_installed); - -my $no_git = 0; - -sub get_compiler_info($) { - my %info = (NAME => shift, VERSION => '0.0'); - my $version = `$info{NAME} -v 2>&1`; - return (ERROR => 1) if $?; - if ($version =~ /(?:clang|llvm)\sversion\s(\d+\.\d+)/i) { - $info{NAME} = 'Clang'; - $info{VERSION} = $1; - $info{UNSUPPORTED} = $1 lt '3.0'; - $info{REASON} = 'Clang 2.9 and older do not have adequate C++ support.'; - } elsif ($version =~ /gcc\sversion\s(\d+\.\d+)/i) { - $info{NAME} = 'GCC'; - $info{VERSION} = $1; - $info{UNSUPPORTED} = $1 lt '4.1'; - $info{REASON} = 'GCC 4.0 and older do not have adequate C++ support.'; - } elsif ($version =~ /(?:icc|icpc)\sversion\s(\d+\.\d+).\d+\s\(gcc\sversion\s(\d+\.\d+).\d+/i) { - $info{NAME} = 'ICC'; - $info{VERSION} = $1; - $info{UNSUPPORTED} = $2 lt '4.1'; - $info{REASON} = "ICC $1 (GCC $2 compatibility mode) does not have adequate C++ support." - } - return %info; -} - -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"; - } +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'; +use constant CONFIGURE_ERROR_PIPE => $ENV{INSPIRCD_VERBOSE} ? '' : '1>/dev/null 2>/dev/null'; + +our @EXPORT = qw(CONFIGURE_CACHE_FILE + CONFIGURE_CACHE_VERSION + cmd_clean + cmd_help + cmd_update + run_test + test_file + test_header + write_configure_cache + get_compiler_info + find_compiler + parse_templates); + +sub __get_socketengines { + my @socketengines; + foreach () { + s/src\/socketengines\/socketengine_(\w+)\.cpp/$1/; + push @socketengines, $1; } - return ""; + return @socketengines; } -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; -} +# TODO: when buildtool is done this can be mostly removed with +# the remainder being merged into parse_templates. +sub __get_template_settings($$$) { -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 !$?; -} + # These are actually hash references + my ($config, $compiler, $version) = @_; + + # Start off by populating with the config + my %settings = %$config; -sub yesno { - my ($flag,$prompt) = @_; - print "$prompt [\e[1;32m$main::config{$flag}\e[0m] -> "; - chomp(my $tmp = ); - if ($tmp eq "") { $tmp = $main::config{$flag} } - if (($tmp eq "") || ($tmp =~ /^y/i)) - { - $main::config{$flag} = "y"; + # Compiler information + while (my ($key, $value) = each %{$compiler}) { + $settings{'COMPILER_' . $key} = $value; } - else - { - $main::config{$flag} = "n"; + + # Version information + while (my ($key, $value) = each %{$version}) { + $settings{'VERSION_' . $key} = $value; } - return; -} -sub resolve_directory -{ - my $ret = $_[0]; - eval - { - use File::Spec; - $ret = File::Spec->rel2abs($_[0]); - }; - return $ret; -} + # 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`); -sub getrevision { - if ($no_git) - { - return "0"; - } - my $data = `git describe --tags 2>/dev/null`; - if ($data eq "") - { - $no_git = 1; - return '0'; - } - chomp $data; # remove \n - return $data; + return %settings; } -sub getcompilerflags { - my ($file) = @_; - open(FLAGS, $file) or return ""; - while () { - if ($_ =~ /^\/\* \$CompileFlags: (.+) \*\/$/) { - my $x = translate_functions($1, $file); - next if ($x eq ""); - close(FLAGS); - return $x; - } - } - close(FLAGS); - return ""; +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 getlinkerflags { - my ($file) = @_; - open(FLAGS, $file) or return ""; - while () { - if ($_ =~ /^\/\* \$LinkerFlags: (.+) \*\/$/) { - my $x = translate_functions($1, $file); - next if ($x eq ""); - close(FLAGS); - return $x; - } - } - close(FLAGS); - return ""; +sub cmd_clean { + unlink CONFIGURE_CACHE_FILE; } -sub getdependencies { - my ($file) = @_; - open(FLAGS, $file) or return ""; - while () { - if ($_ =~ /^\/\* \$ModDep: (.+) \*\/$/) { - my $x = translate_functions($1, $file); - next if ($x eq ""); - close(FLAGS); - return $x; - } - } - close(FLAGS); - return ""; +sub cmd_help { + my $PWD = getcwd(); + my $SELIST = join ', ', __get_socketengines(); + print <) { - if ($_ =~ /^\/\* \$NoPedantic \*\/$/) { - my $x = translate_functions($_, $file); - next if ($x eq ""); - close(FLAGS); - return 1; - } - } - close(FLAGS); - return 0; +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; + say 'Updating...'; + my %config = read_config_file(CONFIGURE_CACHE_FILE); + my %compiler = get_compiler_info($config{CXX}); + my %version = get_version $config{DISTRIBUTION}; + parse_templates(\%config, \%compiler, \%version); + say 'Update complete!'; + exit 0; } -sub getmodules -{ - my ($silent) = @_; +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; +} - my $i = 0; +sub test_file($$;$) { + my ($compiler, $file, $args) = @_; + my $status = 0; + $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; +} - if (!$silent) - { - print "Detecting modules "; - } +sub test_header($$;$) { + my ($compiler, $header, $args) = @_; + $args //= ''; + open(COMPILER, "| $compiler -E - $args ${\CONFIGURE_ERROR_PIPE}") or return 0; + print COMPILER "#include <$header>"; + close(COMPILER); + return !$?; +} - opendir(DIRHANDLE, "src/modules") or die("WTF, missing src/modules!"); - foreach my $name (sort readdir(DIRHANDLE)) - { - if ($name =~ /^m_(.+)\.cpp$/) - { - my $mod = $1; - $main::modlist[$i++] = $mod; - if (!$silent) - { - print "."; - } - } +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}: $!"; } - closedir(DIRHANDLE); - if (!$silent) - { - print "\nOk, $i modules.\n"; - } + print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n"; + my %config = @_; + write_config_file CONFIGURE_CACHE_FILE, %config; } -sub promptnumeric($$) -{ - my $continue = 0; - my ($prompt, $configitem) = @_; - while (!$continue) - { - print "Please enter the maximum $prompt?\n"; - print "[\e[1;32m$main::config{$configitem}\e[0m] -> "; - chomp(my $var = ); - if ($var eq "") - { - $var = $main::config{$configitem}; - } - if ($var =~ /^\d+$/) { - # We don't care what the number is, set it and be on our way. - $main::config{$configitem} = $var; - $continue = 1; - print "\n"; - } else { - print "You must enter a number in this field. Please try again.\n\n"; - } +sub get_compiler_info($) { + my $binary = shift; + 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(.+)$/; } + close $fh; + unlink './__compiler_info'; + return %info; } -sub module_installed($) -{ - my $module = shift; - eval("use $module;"); - return !$@; +sub find_compiler { + 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"; + } } -sub promptstring_s($$) -{ - my ($prompt,$default) = @_; - my $var; - print "$prompt\n"; - print "[\e[1;32m$default\e[0m] -> "; - chomp($var = ); - $var = $default if $var eq ""; - print "\n"; - return $var; -} +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 () { + 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 =