X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Frun-cc.pl;h=d637ba8c95673ed50e2a65417f30a642bb7b0a62;hb=3f94e1fbcd6f0e6a2b1082a6e0a93a1aa5e6344f;hp=71a921c61e7bab3c441593c6a4ae7abe9b994b12;hpb=6da3b9be51b97746af0aba5d98cf120e4f3cf57e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 71a921c61..d637ba8c9 100755
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -26,8 +26,9 @@ 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 = "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
-		if ($type =~ m/::string/) {
+		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;
@@ -37,12 +38,14 @@ my @msgfilters = (
 	[ 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
@@ -54,22 +57,44 @@ my @msgfilters = (
 		} else {
 			$location .= "$msg\n";
 		}
+		return undef;
 	} ],
 
 	[ qr/^.* warning: / => sub {
 		my ($msg) = @_;
-		print $location;
+		my $str = $location . "\e[33;1m$msg\e[0m\n";
+		$showncmdline = 1;
 		$location = "";
-		print STDERR "\e[33;1m$msg\e[0m\n";
+		return $str;
 	} ],
 
 	[ qr/^.* error: / => sub {
 		my ($msg) = @_;
-		print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
+		my $str = "";
+		$str = "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
 		$showncmdline = 1;
-		print $location;
+		$str .= $location . "\e[31;1m$msg\e[0m\n";
+		$location = "";
+		return $str;
+	} ],
+
+	[ qr/./ => sub {
+		my ($msg) = @_;
+		$msg = $location . $msg;
 		$location = "";
-		print STDERR "\e[31;1m$msg\e[0m\n";
+		$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;
 	} ],
 );
 
@@ -80,22 +105,37 @@ my ($r_stderr, $w_stderr);
 my $name = "";
 my $action = "";
 
-foreach my $n (@ARGV)
-{
-	if ($n =~ /\.cpp$/)
-	{
-		$action = "BUILD";
-		$name = $n;
-		last;
-	}
-	elsif ($n eq "-o")
-	{
-		$action = $name = $n;
-	}
-	elsif ($name eq "-o")
+if ($cc eq "ar") {
+	$name = $ARGV[1];
+	$action = "ARCHIVE";
+} else {
+	foreach my $n (@ARGV)
 	{
-		$action = "LINK";
-		$name = $n;
+		if ($n =~ /\.cpp$/)
+		{
+			if ($action eq "BUILD")
+			{
+				$name .= " " . $n;
+			}
+			else
+			{
+				$action = "BUILD";
+				$name = $n;
+			}
+		}
+		elsif ($action eq "BUILD") # .cpp has priority.
+		{
+			next;
+		}
+		elsif ($n eq "-o")
+		{
+			$action = $name = $n;
+		}
+		elsif ($name eq "-o")
+		{
+			$action = "LINK";
+			$name = $n;
+		}
 	}
 }
 
@@ -107,11 +147,11 @@ pipe($r_stderr, $w_stderr) or die "pipe stderr: $!\n";
 
 $pid = fork;
 
-die "Cannot fork to start gcc! $!\n" unless defined($pid);
+die "Cannot fork to start $cc! $!\n" unless defined($pid);
 
 if ($pid) {
 
-	print "\t\e[1;32m$action:\e[0m\t\t$name\n" unless $name eq "";
+	printf "\t\e[1;32m%-20s\e[0m%s\n", $action . ":", $name unless $name eq "";
 
 	my $fail = 0;
 	# Parent - Close child-side pipes.
@@ -121,20 +161,24 @@ if ($pid) {
 	# 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])) {
 				$@ = "";
-				eval {
+				$line = eval {
 					$filter->[1]->($line, @caps);
 				};
 				if ($@) {
+					# Note that $line is undef now.
 					$fail = 1;
 					print STDERR $@;
 				}
-				next LINE;
+				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;