X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fconfigure.pm;h=6b4693d453532d216f578a771e6c2fb193a72a19;hb=7ee8ea71b7d6e939d8e08d332feee2a27d662155;hp=9a53221a8667abe2f27cb4e3974f4157dcba1234;hpb=aae283e1dd292ace3a02809ca571a72eb06d9732;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/configure.pm b/make/configure.pm
index 9a53221a8..6b4693d45 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`);
@@ -158,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
@@ -179,7 +181,7 @@ sub cmd_update {
 	say 'Updating...';
 	my %config = read_configure_cache();
 	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;
@@ -217,7 +219,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 +227,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);
 }
@@ -238,9 +245,11 @@ sub write_configure_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);
@@ -258,21 +267,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
@@ -335,7 +329,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.
@@ -415,9 +409,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 $_;
 				}