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';
our @EXPORT = qw(CONFIGURE_CACHE_FILE
write_configure_cache
get_compiler_info
find_compiler
- get_property
parse_templates);
sub __get_socketengines {
}
# 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`);
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});
my %version = get_version();
parse_templates(\%config, \%compiler, \%version);
- print "Update complete!\n";
+ say 'Update complete!';
exit 0;
}
sub run_test($$;$) {
my ($what, $result, $adjective) = @_;
- $adjective ||= 'available';
+ $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);
open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
while (my $line = <CACHE>) {
next if $line =~ /^\s*($|\#)/;
- my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
+ my ($key, $value) = ($line =~ /^(\S+)(?:\s(.*))?$/);
$config{$key} = $value;
}
close(CACHE);
}
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}: $!";
+ }
+
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";
+ $value //= '';
+ say CACHE "$key $value";
}
close(CACHE);
}
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) {
+ 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);
sub find_compiler {
my @compilers = qw(c++ g++ clang++ icpc);
- foreach my $compiler (shift || @compilers) {
+ 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($$$) {
# These are actually hash references
# 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.
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);
projects / user / henk / code / inspircd.git / blobdiff