X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=a104933188f4afcf27a7c0807b0923a7df154457;hb=127683c29e6eb33c21f85cf1ccba6fb85fc0cdec;hp=d04a0b645d83fc87777df090025492344173e13b;hpb=11f4d02e7020cb5775d2b89af0e652e53cd90ed7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/configure.pm b/make/configure.pm index d04a0b645..a10493318 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -1,7 +1,7 @@ # # InspIRCd -- Internet Relay Chat Daemon # -# Copyright (C) 2012-2014 Peter Powell +# Copyright (C) 2012-2017 Peter Powell # Copyright (C) 2008 Robin Burchell # Copyright (C) 2007-2008 Craig Edwards # Copyright (C) 2008 Thomas Stagner @@ -22,28 +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 'getcwd'; -use Exporter 'import'; -use File::Basename '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; -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 - dump_hash get_property parse_templates); - -sub __get_socketengines() { +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/; @@ -54,12 +68,12 @@ 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 + # Start off by populating with the config my %settings = %$config; # Compiler information @@ -68,20 +82,28 @@ 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`); 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 '.config.cache'; + unlink CONFIGURE_CACHE_FILE; } sub cmd_help { @@ -112,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 @@ -130,11 +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. - --uid=[name] Sets the user to run InspIRCd as. --socketengine=[name] Sets the socket engine to be used. Possible values are $SELIST. - --update Updates the build environment. + --uid=[id|name] Sets the user to run InspIRCd as. + --update Updates the build environment with the settings + from the cache. FLAGS @@ -144,147 +170,93 @@ 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 { - print_error "You have not run $0 before. Please do this before trying to update the generated files." unless -f '.config.cache'; - print "Updating...\n"; - my %config = read_configure_cache(); + 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}); - 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 read_configure_cache { - my %cfg = (); - open(CACHE, '.config.cache') or return %cfg; - while (my $line = ) { - next if $line =~ /^\s*($|\#)/; - my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/); - $cfg{$key} = $value; - } - close(CACHE); - return %cfg; +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 ${\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 ${\CONFIGURE_ERROR_PIPE}") or return 0; + print COMPILER "#include <$header>"; + close(COMPILER); + return !$?; } 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}: $!"; } - close(CACHE); - return 1; + + print_format "Writing <|GREEN ${\CONFIGURE_CACHE_FILE}|> ...\n"; + my %config = @_; + write_config_file CONFIGURE_CACHE_FILE, %config; } 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 () { - if ($_ =~ /^\/\* \$(\S+): (.+) \*\/$/) { - next unless $1 eq $property; - close(MODULE); - return translate_functions($2, $file); - } - } - close(MODULE); - return defined $default ? $default : ''; -} - -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"; -} - -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 () { @@ -300,7 +272,7 @@ sub parse_templates($$) { while ($line =~ /(@(\w+?)@)/) { my ($variable, $name) = ($1, $2); if (defined $settings{$name}) { - $line =~ s/$variable/$settings{$name}/; + $line =~ s/\Q$variable\E/$settings{$name}/; } else { print_warning "unknown template variable '$name' in $_!"; last; @@ -340,7 +312,7 @@ sub parse_templates($$) { # Add a default target if the template has not defined one. unless (scalar keys %targets) { - $targets{DEFAULT} = basename $_; + $targets{DEFAULT} = catfile(CONFIGURE_DIRECTORY, basename $_); } # Second pass: parse makefile junk and write files. @@ -420,11 +392,18 @@ sub parse_templates($$) { 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 $_: $!"; + open(TARGET, '>', $target) or print_error "unable to write $target: $!"; foreach (@final_lines) { - print TARGET $_, "\n"; + say TARGET $_; } close(TARGET);