BEGIN {
- require 5.8.0;
+ require 5.10.0;
}
package make::configure;
+use feature ':5.10';
use strict;
use warnings FATAL => qw(all);
use Exporter qw(import);
use File::Basename qw(basename);
+use make::common;
use make::console;
use make::utilities;
# 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;
}
# Version information
- my %version = get_version();
- while (my ($key, $value) = each %version) {
+ while (my ($key, $value) = each %{$version}) {
$settings{'VERSION_' . $key} = $value;
}
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;
}
--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
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 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;
}
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";
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);
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);
}
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";
}
}
}
}
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/*>) {
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);