Merge pull request #1024 from SaberUK/master+make-perl-cleanup

Start cleaning up the make/*.pl files.

4 files changed, 69 insertions, 318 deletions

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 376d19573..513038843 100755
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -19,9 +19,21 @@
 #
 
 
+BEGIN {
+	require 5.10.0;
+	unless (-f 'configure') {
+		print "Error: $0 must be run from the main source directory!\n";
+		exit 1;
+	}
+}
+
 use strict;
-use warnings;
-use POSIX qw(getcwd);
+use warnings FATAL => qw(all);
+
+use constant {
+	BUILDPATH  => $ENV{BUILDPATH},
+	SOURCEPATH => $ENV{SOURCEPATH}
+};
 
 sub find_output;
 sub gendep($);
@@ -36,19 +48,14 @@ run;
 exit 0;
 
 sub run() {
-	my $build = $ENV{BUILDPATH};
-	mkdir $build;
-	chdir $build or die "Could not open build directory: $!";
+	mkdir BUILDPATH;
+	chdir BUILDPATH or die "Could not open build directory: $!";
 	unlink 'include';
-	symlink "$ENV{SOURCEPATH}/include", 'include';
+	symlink "${\SOURCEPATH}/include", 'include';
 	mkdir $_ for qw/bin modules obj/;
-# BSD make has a horribly annoying bug resulting in an extra chdir of the make process
-# Create symlinks to work around it
-	symlink "../$_", "obj/$_" for qw/bin coremods modules obj/;
 
-	$build = getcwd();
 	open MAKE, '>real.mk' or die "Could not write real.mk: $!";
-	chdir "$ENV{SOURCEPATH}/src";
+	chdir "${\SOURCEPATH}/src";
 
 	if ($ENV{PURE_STATIC}) {
 		run_static();
@@ -59,7 +66,6 @@ sub run() {
 }
 
 sub run_dynamic() {
-	my $build = $ENV{BUILDPATH};
 	print MAKE <<END;
 # DO NOT EDIT THIS FILE
 # It is autogenerated by make/calcdep.pl, and will be overwritten
@@ -71,10 +77,10 @@ bad-target:
 	\@echo "in order to set the correct environment variables"
 	\@exit 1
 
-all: inspircd coremods modules
+all: inspircd modules
 
 END
-	my(@core_deps, @cmodlist, @modlist);
+	my(@core_deps, @modlist);
 	for my $file (<*.cpp>, <modes/*.cpp>, <socketengines/*.cpp>, "threadengines/threadengine_pthread.cpp") {
 		my $out = find_output $file;
 		dep_cpp $file, $out, 'gen-o';
@@ -82,40 +88,28 @@ END
 		push @core_deps, $out;
 	}
 
-	opendir my $coremoddir, 'coremods';
-	for my $file (sort readdir $coremoddir) {
-		next if $file =~ /^\./;
-		if ($file =~ /^core_/ && -d "coremods/$file" && dep_dir "coremods/$file", "modules/$file") {
-			mkdir "$build/obj/$file";
-			push @cmodlist, "modules/$file.so";
-		}
-		if ($file =~ /^core_.*\.cpp$/) {
-			my $out = dep_so "coremods/$file";
-			push @cmodlist, $out;
-		}
-	}
-
-	opendir my $moddir, 'modules';
-	for my $file (sort readdir $moddir) {
-		next if $file =~ /^\./;
-		if (-e "modules/extra/$file" && !-l "modules/$file") {
-			# Incorrect symlink?
-			print "Replacing symlink for $file found in modules/extra\n";
-			rename "modules/$file", "modules/$file~";
-			symlink "extra/$file", "modules/$file";
-		}
-		if ($file =~ /^m_/ && -d "modules/$file" && dep_dir "modules/$file", "modules/$file") {
-			mkdir "$build/obj/$file";
-			push @modlist, "modules/$file.so";
-		}
-		if ($file =~ /^m_.*\.cpp$/) {
-			my $out = dep_so "modules/$file";
-			push @modlist, $out;
+	foreach my $directory (qw(coremods modules)) {
+		opendir(my $moddir, $directory);
+		for my $file (sort readdir $moddir) {
+			next if $file =~ /^\./;
+			if ($directory eq 'modules' && -e "modules/extra/$file" && !-l "modules/$file") {
+				# Incorrect symlink?
+				print "Replacing symlink for $file found in modules/extra\n";
+				rename "modules/$file", "modules/$file~";
+				symlink "extra/$file", "modules/$file";
+			}
+			if ($file =~ /^(?:core|m)_/ && -d "$directory/$file" && dep_dir "$directory/$file", "modules/$file") {
+				mkdir "${\BUILDPATH}/obj/$file";
+				push @modlist, "modules/$file.so";
+			}
+			if ($file =~ /^.*\.cpp$/) {
+				my $out = dep_so "$directory/$file";
+				push @modlist, $out;
+			}
 		}
 	}
 	
 	my $core_mk = join ' ', @core_deps;
-	my $cmods = join ' ', @cmodlist;
 	my $mods = join ' ', @modlist;
 	print MAKE <<END;
 
@@ -124,11 +118,9 @@ bin/inspircd: $core_mk
 
 inspircd: bin/inspircd
 
-coremods: $cmods
-
 modules: $mods
 
-.PHONY: all bad-target inspircd coremods modules
+.PHONY: all bad-target inspircd modules
 
 END
 }
@@ -153,7 +145,7 @@ END
 			<modules/*.cpp>, <modules/m_*/*.cpp>, "threadengines/threadengine_pthread.cpp") {
 		my $out = find_output $file, 1;
 		if ($out =~ m#obj/([^/]+)/[^/]+.o$#) {
-			mkdir "$ENV{BUILDPATH}/obj/$1";
+			mkdir "${\BUILDPATH}/obj/$1";
 		}
 		dep_cpp $file, $out, 'gen-o';
 		next if $file =~ m#^socketengines/# && $file ne "socketengines/socketengine_$ENV{SOCKETENGINE}.cpp";
diff --git a/make/run-cc.pl b/make/run-cc.pl
deleted file mode 100755
index 58b5850ca..000000000
--- a/make/run-cc.pl
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env perl
-
-#
-# InspIRCd -- Internet Relay Chat Daemon
-#
-#   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
-#   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
-#
-# This file is part of InspIRCd.  InspIRCd is free software: you can
-# redistribute it and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation, version 2.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-### THIS IS DESIGNED TO BE RUN BY MAKE! DO NOT RUN FROM THE SHELL (because it MIGHT sigterm the shell)! ###
-
-use strict;
-use warnings FATAL => qw(all);
-
-use POSIX ();
-
-# Runs the compiler, passing it the given arguments.
-# Filters select output from the compiler's standard error channel and
-# can take different actions as a result.
-
-# NOTE: this is *NOT* a hash (sadly: a hash would stringize all the regexes and thus render them useless, plus you can't index a hash based on regexes anyway)
-# even though we use the => in it.
-
-# The subs are passed the message, and anything the regex captured.
-
-my $cc = shift(@ARGV);
-
-my $showncmdline = 0;
-
-# GCC's "location of error stuff", which accumulates the "In file included from" include stack
-my $location = "";
-
-my @msgfilters = (
-	[ qr/^(.*) warning: cannot pass objects of non-POD type `(.*)' through `\.\.\.'; call will abort at runtime/ => sub {
-		my ($msg, $where, $type) = @_;
-		my $errstr = $location . "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
-		$location = "";
-		if ($type =~ m/::(basic_)?string/) {
-			$errstr .= "$where (Did you forget to call c_str()?)\n";
-		}
-		die $errstr;
-	} ],
-
-	# Start of an include stack.
-	[ qr/^In file included from .*[,:]$/ => sub {
-		my ($msg) = @_;
-		$location = "$msg\n";
-		return undef;
-	} ],
-
-	# Continuation of an include stack.
-	[ qr/^                 from .*[,:]$/ => sub {
-		my ($msg) = @_;
-		$location .= "$msg\n";
-		return undef;
-	} ],
-
-	# A function, method, constructor, or destructor is the site of a problem
-	[ qr/In ((con|de)structor|(member )?function)/ => sub {
-		my ($msg) = @_;
-		# If a complete location string is waiting then probably we dropped an error, so drop the location for a new one.
-		if ($location =~ m/In ((con|de)structor|(member )?function)/) {
-			$location = "$msg\n";
-		} else {
-			$location .= "$msg\n";
-		}
-		return undef;
-	} ],
-
-	[ qr/^.* warning: / => sub {
-		my ($msg) = @_;
-		my $str = $location . "\e[33;1m$msg\e[0m\n";
-		$showncmdline = 1;
-		$location = "";
-		return $str;
-	} ],
-
-	[ qr/^.* error: / => sub {
-		my ($msg) = @_;
-		my $str = "";
-		$str = "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
-		$showncmdline = 1;
-		$str .= $location . "\e[31;1m$msg\e[0m\n";
-		$location = "";
-		return $str;
-	} ],
-
-	[ qr/./ => sub {
-		my ($msg) = @_;
-		$msg = $location . $msg;
-		$location = "";
-		$msg =~ s/std::basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
-		$msg =~ s/std::basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
-		for my $stl (qw(deque vector list)) {
-			$msg =~ s/std::$stl\<(\S+), std::allocator\<\1\> \>/std::$stl\<$1\>/g;
-			$msg =~ s/std::$stl\<(std::pair\<\S+, \S+\>), std::allocator\<\1 \> \>/std::$stl<$1 >/g;
-		}
-		$msg =~ s/std::map\<(\S+), (\S+), std::less\<\1\>, std::allocator\<std::pair\<const \1, \2\> \> \>/std::map<$1, $2>/g;
-		# Warning: These filters are GNU C++ specific!
-		$msg =~ s/__gnu_cxx::__normal_iterator\<(\S+)\*, std::vector\<\1\> \>/std::vector<$1>::iterator/g;
-		$msg =~ s/__gnu_cxx::__normal_iterator\<(std::pair\<\S+, \S+\>)\*, std::vector\<\1 \> \>/std::vector<$1 >::iterator/g;
-		$msg =~ s/__gnu_cxx::__normal_iterator\<char\*, std::string\>/std::string::iterator/g;
-		$msg =~ s/__gnu_cxx::__normal_iterator\<char\*, irc::string\>/irc::string::iterator/g;
-		return $msg;
-	} ],
-);
-
-my $pid;
-
-my ($r_stderr, $w_stderr);
-
-my $name = "";
-my $action = "";
-
-if ($cc eq "ar") {
-	$name = $ARGV[1];
-	$action = "ARCHIVE";
-} else {
-	foreach my $n (@ARGV)
-	{
-		if ($n =~ /\.cpp$/)
-		{
-			my $f = $n;
-			if (defined $ENV{SOURCEPATH}) {
-				$f =~ s#^$ENV{SOURCEPATH}/src/##;
-			}
-			if ($action eq "BUILD")
-			{
-				$name .= " " . $f;
-			}
-			else
-			{
-				$action = "BUILD";
-				$name = $f;
-			}
-		}
-		elsif ($action eq "BUILD") # .cpp has priority.
-		{
-			next;
-		}
-		elsif ($n eq "-o")
-		{
-			$action = $name = $n;
-		}
-		elsif ($name eq "-o")
-		{
-			$action = "LINK";
-			$name = $n;
-		}
-	}
-}
-
-if (!defined($cc) || $cc eq "") {
-	die "Compiler not specified!\n";
-}
-
-pipe($r_stderr, $w_stderr) or die "pipe stderr: $!\n";
-
-$pid = fork;
-
-die "Cannot fork to start $cc! $!\n" unless defined($pid);
-
-if ($pid) {
-
-	printf "\t\e[1;32m%-20s\e[0m%s\n", $action . ":", $name unless $name eq "";
-
-	my $fail = 0;
-	# Parent - Close child-side pipes.
-	close $w_stderr;
-	# Close STDIN to ensure no conflicts with child.
-	close STDIN;
-	# Now read each line of stderr
-LINE:	while (defined(my $line = <$r_stderr>)) {
-		chomp $line;
-
-		for my $filter (@msgfilters) {
-			my @caps;
-			if (@caps = ($line =~ $filter->[0])) {
-				$@ = "";
-				$line = eval {
-					$filter->[1]->($line, @caps);
-				};
-				if ($@) {
-					# Note that $line is undef now.
-					$fail = 1;
-					print STDERR $@;
-				}
-				next LINE unless defined($line);
-			}
-		}
-		# Chomp off newlines again, in case the filters put some back in.
-		chomp $line;
-		print STDERR "$line\n";
-	}
-	waitpid $pid, 0;
-	close $r_stderr;
-	my $exit = $?;
-	# Simulate the same exit, so make gets the right termination info.
-	if (POSIX::WIFSIGNALED($exit)) {
-		# Make won't get the right termination info (it gets ours, not the compiler's), so we must tell the user what really happened ourselves!
-		print STDERR "$cc killed by signal " . POSIX::WTERMSIGN($exit) . "\n";
-		kill "TERM", getppid(); # Needed for bsd make.
-		kill "TERM", $$;
-	}
-	else {
-		if (POSIX::WEXITSTATUS($exit) == 0) {
-			if ($fail) {
-				kill "TERM", getppid(); # Needed for bsd make.
-				kill "TERM", $$;
-			}
-			exit 0;
-		} else {
-			exit POSIX::WEXITSTATUS($exit);
-		}
-	}
-} else {
-	# Child - Close parent-side pipes.
-	close $r_stderr;
-	# Divert stderr
-	open STDERR, ">&", $w_stderr or die "Cannot divert STDERR: $!\n";
-	# Run the compiler!
-	exec { $cc } $cc, @ARGV;
-	die "exec $cc: $!\n";
-}
diff --git a/make/template/main.mk b/make/template/main.mk
index 9630905b1..3e7ee1844 100644
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -114,14 +114,10 @@ FOOTER = finishmessage
 @TARGET BSD_MAKE SOURCEPATH != /bin/pwd
 
 @IFDEF V
-  RUNCC = $(CXX)
-  RUNLD = $(CXX)
   VERBOSE = -v
 @ELSE
   @TARGET GNU_MAKE MAKEFLAGS += --silent
   @TARGET BSD_MAKE MAKE += -s
-  RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
-  RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CXX)
   VERBOSE =
 @ENDIF
 
@@ -133,7 +129,7 @@ FOOTER = finishmessage
 # things like -Wfatal-errors if they wish to.
 CORECXXFLAGS += $(CXXFLAGS)
 
-@DO_EXPORT RUNCC RUNLD CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
 @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC
 
 # Default target
diff --git a/make/unit-cc.pl b/make/unit-cc.pl
index 66e9b15dc..0a20738db 100755
--- a/make/unit-cc.pl
+++ b/make/unit-cc.pl
@@ -19,10 +19,18 @@
 #
 
 
+BEGIN {
+	push @INC, $ENV{SOURCEPATH};
+	require 5.10.0;
+}
+
 use strict;
-use warnings;
-BEGIN { push @INC, $ENV{SOURCEPATH}; }
+use warnings FATAL => qw(all);
+
+use File::Spec::Functions qw(abs2rel);
+
 use make::configure;
+use make::console;
 
 chdir $ENV{BUILDPATH};
 
@@ -30,21 +38,7 @@ my $type = shift;
 my $out = shift;
 my $verbose = ($type =~ s/-v$//);
 
-## BEGIN HACK: REMOVE IN 2.2!
-sub read_config_cache {
-	my %cfg = ();
-	open(CACHE, '../.config.cache') or return %cfg;
-	while (my $line = <CACHE>) {
-		next if $line =~ /^\s*($|\#)/;
-		my ($key, $value) = ($line =~ /^(\S+)="(.*)"$/);
-		$cfg{$key} = $value;
-	}
-	close(CACHE);
-	return %cfg;
-}
-
-our %config = read_config_cache();
-## END HACK
+our %config = read_configure_cache();
 
 if ($type eq 'gen-ld') {
 	do_static_find(@ARGV);
@@ -65,6 +59,15 @@ if ($type eq 'gen-ld') {
 }
 exit 1;
 
+sub message($$$) {
+	my ($type, $file, $command) = @_;
+	if ($verbose) {
+		print "$command\n";
+	} else {
+		print_format "\t<|GREEN $type:|>\t\t$file\n";
+	}
+}
+
 sub do_static_find {
 	my @flags;
 	for my $file (@ARGV) {
@@ -77,7 +80,7 @@ sub do_static_find {
 }
 
 sub do_static_link {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS}";
+	my $execstr = "$ENV{CXX} -o $out $ENV{CORELDFLAGS}";
 	for (@ARGV) {
 		if (/\.cmd$/) {
 			open F, '<', $_;
@@ -90,19 +93,19 @@ sub do_static_link {
 		}
 	}
 	$execstr .= ' '.$ENV{LDLIBS};
-	print "$execstr\n" if $verbose;
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
 sub do_core_link {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
-	print "$execstr\n" if $verbose;
+	my $execstr = "$ENV{CXX} -o $out $ENV{CORELDFLAGS} @_ $ENV{LDLIBS}";
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
 sub do_link_dir {
-	my $execstr = "$ENV{RUNLD} -o $out $ENV{PICLDFLAGS} @_";
-	print "$execstr\n" if $verbose;
+	my $execstr = "$ENV{CXX} -o $out $ENV{PICLDFLAGS} @_";
+	message 'LINK', $out, $execstr;
 	exec $execstr;
 }
 
@@ -111,15 +114,12 @@ sub do_compile {
 
 	my $flags = '';
 	my $libs = '';
-	my $binary = $ENV{RUNCC};
 	if ($do_compile) {
 		$flags = $ENV{CORECXXFLAGS} . ' ' . get_property($file, 'CompileFlags');
 
 		if ($file =~ m#(?:^|/)((?:m|core)_[^/. ]+)(?:\.cpp|/.*\.cpp)$#) {
 			$flags .= ' -DMODNAME=\\"'.$1.'\\"';
 		}
-	} else {
-		$binary = $ENV{RUNLD};
 	}
 
 	if ($do_link) {
@@ -129,7 +129,7 @@ sub do_compile {
 		$flags .= ' -c';
 	}
 
-	my $execstr = "$binary -o $out $flags $file $libs";
-	print "$execstr\n" if $verbose;
+	my $execstr = "$ENV{CXX} -o $out $flags $file $libs";
+	message 'BUILD', abs2rel($file, "$ENV{SOURCEPATH}/src"), $execstr;
 	exec $execstr;
 }