X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=make%2Fconfigure.pm;h=e88454658811c34821f9bb5511c94cde438fdd58;hb=806e57433a38193ae14942ee60f573fe47f4b643;hp=e314e6d159305cfe0a6082072f576a04616874f8;hpb=cd67a0a6f9380d4a54bc92370f2925f2d2a684dc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index e314e6d15..e88454658 100644
--- a/make/configure.pm
+++ b/make/configure.pm
@@ -31,15 +31,16 @@ 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
@@ -54,7 +55,6 @@ our @EXPORT = qw(CONFIGURE_CACHE_FILE
                  write_configure_cache
                  get_compiler_info
                  find_compiler
-                 get_property
                  parse_templates);
 
 sub __get_socketengines {
@@ -87,6 +87,7 @@ sub __get_template_settings($$$) {
 	}
 
 	# 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`);
@@ -217,7 +218,7 @@ sub read_configure_cache {
 	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);
@@ -225,12 +226,17 @@ sub read_configure_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 //= '';
-		say CACHE "$key=\"$value\"";
+		say CACHE "$key $value";
 	}
 	close(CACHE);
 }
@@ -260,21 +266,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
@@ -337,7 +328,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.
@@ -417,9 +408,16 @@ 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) {
 					say TARGET $_;
 				}