Don't check Q:Lines if server is enforcing a nick change (I forgot we had a way to...

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

diff --git a/make/run-cc.pl b/make/run-cc.pl
index 380b01ef7307f6a71f6ca6e851706f302c76ce3a..7ea2f39d009b85120a0f4849a4df3f10bfdcbe1c 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,42 @@ my $pid;
 
 my ($r_stderr, $w_stderr);
 
-my $cc = shift(@ARGV);
+my $name = "";
+my $action = "";
+
+if ($cc eq "ar") {
+       $name = $ARGV[1];
+       $action = "ARCHIVE";
+} else {
+       foreach my $n (@ARGV)
+       {
+               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;
+               }
+       }
+}
 
 if (!defined($cc) || $cc eq "") {
        die "Compiler not specified!\n";
@@ -51,9 +124,12 @@ 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) {
+
+       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;
@@ -62,6 +138,16 @@ if ($pid) {
        # Now read each line of stderr
 LINE:  while (defined(my $line = <$r_stderr>)) {
                chomp $line;
+
+               # someone come up with a better way of doing this, it cant go in message filters as message filters
+               # cant do straight-out replace.
+               #
+               # The order of these replacements is IMPORTANT. DO NOT REORDER THEM.
+
+               $line =~ s/std\:\:basic_string\<char\, std\:\:char_traits\<char\>, std::allocator\<char\> \>(\s+|)/std::string/g;
+               $line =~ s/std\:\:basic_string\<char\, .*?irc_char_traits\<char\>, std::allocator\<char\> \>(\s+|)/irc::string/g;
+               $line =~ s/std\:\:deque\<(\S+)\, std::allocator\<\S+\> \>/std::deque<$1>/g;
+
                for my $filter (@msgfilters) {
                        my @caps;
                        if (@caps = ($line =~ $filter->[0])) {