Threadengine stuff

[user/henk/code/inspircd.git] / make / run-cc.pl

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 380b01ef7307f6a71f6ca6e851706f302c76ce3a..0b0ac5bad24781dc0fcb9e2e81c0935af394ab08 100755 (executable)
--- a/make/run-cc.pl
+++ b/make/run-cc.pl
@@ -16,23 +16,61 @@ use POSIX ();
 
 # 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) = @_;
+               print $location;
+               $location = "";
                my $errstr = "$where error: cannot pass objects of non-POD type `$type' through `...'\n";
-               if ($type =~ m/::string/) {
+               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";
+       } ],
+
+       # Continuation of an include stack.
+       [ qr/^                 from .*[,:]$/ => sub {
+               my ($msg) = @_;
+               $location .= "$msg\n";
+       } ],
+
+       # 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";
+               }
+       } ],
+
        [ qr/^.* warning: / => sub {
                my ($msg) = @_;
+               print $location;
+               $location = "";
                print STDERR "\e[33;1m$msg\e[0m\n";
        } ],
 
        [ qr/^.* error: / => sub {
                my ($msg) = @_;
+               print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n" unless $showncmdline;
+               $showncmdline = 1;
+               print $location;
+               $location = "";
                print STDERR "\e[31;1m$msg\e[0m\n";
        } ],
 );
@@ -41,7 +79,27 @@ my $pid;
 
 my ($r_stderr, $w_stderr);
 
-my $cc = shift(@ARGV);
+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")
+       {
+               $action = "LINK";
+               $name = $n;
+       }
+}
 
 if (!defined($cc) || $cc eq "") {
        die "Compiler not specified!\n";
@@ -54,6 +112,9 @@ $pid = fork;
 die "Cannot fork to start gcc! $!\n" unless defined($pid);
 
 if ($pid) {
+
+       print "\t\e[1;32m$action:\e[0m\t\t$name\n" unless $name eq "";
+
        my $fail = 0;
        # Parent - Close child-side pipes.
        close $w_stderr;