X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Frun-cc.pl;h=58b5850ca1142f1b8feda00c9c59df13dd32005a;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=58e7f6050849b208ab35cf969f58868738fe41a6;hpb=df167bf4ac944ad8c679d2b2751fcf94adc8c714;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/run-cc.pl b/make/run-cc.pl index 58e7f6050..58b5850ca 100755 --- a/make/run-cc.pl +++ b/make/run-cc.pl @@ -1,4 +1,24 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +# +# InspIRCd -- Internet Relay Chat Daemon +# +# Copyright (C) 2008 Thomas Stagner +# Copyright (C) 2008 Craig Edwards +# +# 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 . +# + ### THIS IS DESIGNED TO BE RUN BY MAKE! DO NOT RUN FROM THE SHELL (because it MIGHT sigterm the shell)! ### @@ -18,25 +38,83 @@ use POSIX (); 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 = "$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; } ], + # 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) = @_; - print STDERR "\e[33;1m$msg\e[0m\n"; + my $str = $location . "\e[33;1m$msg\e[0m\n"; + $showncmdline = 1; + $location = ""; + return $str; } ], [ qr/^.* error: / => sub { my ($msg) = @_; - print STDERR "An error occured when executing:\e[37;1m $cc " . join(' ', @ARGV) . "\n"; - print STDERR "\e[31;1m$msg\e[0m\n"; + 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\, std::allocator\ \>(\s+|)/std::string/g; + $msg =~ s/std::basic_string\, std::allocator\ \>(\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::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\/std::string::iterator/g; + $msg =~ s/__gnu_cxx::__normal_iterator\/irc::string::iterator/g; + return $msg; } ], ); @@ -45,12 +123,43 @@ my $pid; my ($r_stderr, $w_stderr); my $name = ""; +my $action = ""; -foreach my $n (@ARGV) -{ - if ($n =~ /\.cpp$/) +if ($cc eq "ar") { + $name = $ARGV[1]; + $action = "ARCHIVE"; +} else { + foreach my $n (@ARGV) { - $name = $n; + 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; + } } } @@ -62,11 +171,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;32mBUILD:\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. @@ -76,20 +185,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;