Extract core logic of write_configure_cache to write_config_file.

[user/henk/code/inspircd.git] / make / configure.pm

diff --git a/make/configure.pm b/make/configure.pm
index ee96e3c6973ec26fcd8d4d0d9a5006cca1cccb48..a104933188f4afcf27a7c0807b0923a7df154457 100644 (file)
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2012-2014 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2012-2017 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>
@@ -38,11 +38,11 @@ use File::Spec::Functions qw(catfile);
 
 use make::common;
 use make::console;
-use make::utilities;
 
 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
@@ -52,11 +52,9 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
                  run_test
                  test_file
                  test_header
-                 read_configure_cache
                  write_configure_cache
                  get_compiler_info
                  find_compiler
-                 get_property
                  parse_templates);
 
 sub __get_socketengines {
@@ -99,7 +97,7 @@ sub __get_template_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`", !system "$compiler -v ${\CONFIGURE_ERROR_PIPE}");
        return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible');
        return 1;
 }
@@ -161,7 +159,8 @@ MISC OPTIONS
   --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.
+  --update                      Updates the build environment with the settings
+                                from the cache.
 
 
 FLAGS
@@ -180,9 +179,9 @@ EOH
 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_configure_cache();
+       my %config = read_config_file(CONFIGURE_CACHE_FILE);
        my %compiler = get_compiler_info($config{CXX});
-       my %version = get_version();
+       my %version = get_version $config{DISTRIBUTION};
        parse_templates(\%config, \%compiler, \%version);
        say 'Update complete!';
        exit 0;
@@ -200,8 +199,8 @@ 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";
+       $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;
 }
@@ -209,24 +208,12 @@ sub test_file($$;$) {
 sub test_header($$;$) {
        my ($compiler, $header, $args) = @_;
        $args //= '';
-       open(COMPILER, "| $compiler -E - $args >/dev/null 2>&1") or return 0;
+       open(COMPILER, "| $compiler -E - $args ${\CONFIGURE_ERROR_PIPE}") or return 0;
        print COMPILER "#include <$header>";
        close(COMPILER);
        return !$?;
 }
 
-sub read_configure_cache {
-       my %config;
-       open(CACHE, CONFIGURE_CACHE_FILE) or return %config;
-       while (my $line = <CACHE>) {
-               next if $line =~ /^\s*($|\#)/;
-               my ($key, $value) = ($line =~ /^(\S+)(?:\s(.+))?$/);
-               $config{$key} = $value;
-       }
-       close(CACHE);
-       return %config;
-}
-
 sub write_configure_cache(%) {
        unless (-e CONFIGURE_DIRECTORY) {
                print_format "Creating <|GREEN ${\CONFIGURE_DIRECTORY}|> ...\n";
@@ -235,12 +222,7 @@ sub write_configure_cache(%) {
 
        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);
+       write_config_file CONFIGURE_CACHE_FILE, %config;
 }
 
 sub get_compiler_info($) {
@@ -268,21 +250,6 @@ sub find_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 $default // '';
-}
-
 sub parse_templates($$$) {
 
        # These are actually hash references