[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/parts/outputviews
From:       Robert Gruber <rgruber () users ! sourceforge ! net>
Date:       2005-04-05 20:23:23
Message-ID: 20050405202323.C3740492 () office ! kde ! org
[Download RAW message or body]

CVS commit by rgruber: 

Added new ActionFormat to correctly recognice output of libtool&autmake 
if compiling *.c files.
Also added a new testcase for this. All testcases still pass.


  M +9 -0      makeactionfilter.cpp   1.24


--- kdevelop/parts/outputviews/makeactionfilter.cpp  #1.23:1.24
@@ -48,4 +48,5 @@ MakeActionFilter::ActionFormat* MakeActi
                 ActionFormat( i18n("compiling"), "g++", "g\\+\\+\\S* (?:\\S* )*-c (?:\\S* )*-o \
                (?:\\S* )(?:[^/;]*/)*([^/\\s;]+)", 1 ),
                 ActionFormat( i18n("compiling"), "gcc", "g\\c\\c\\S* (?:\\S* )*-c (?:\\S* \
)*`[^`]*`(?:[^/\\s;]*/)*([^/\\s;]+)", 1 ), +                ActionFormat( i18n("compiling"), \
                "gcc", "g\\c\\c\\S* (?:\\S* )*-c (?:\\S* )*-o (?:\\S* \
                )(?:[^/;]*/)*([^/\\s;]+)", 1 ),
                 ActionFormat( i18n("compiling"), "gcc", "g\\c\\c\\S* (?:\\S* )*-c (?:\\S* \
                )*(?:[^/]*/)*([^/\\s;]*)", 1 ),
                 ActionFormat( i18n("compiling"), "distcc", "distcc (?:\\S* )*-c (?:\\S* \
)*`[^`]*`(?:[^/\\s;]*/)*([^/\\s;]+)", 1 ), @@ -164,4 +165,12 @@ void MakeActionFilter::test()
                 "\".deps/mainwindowideal.Tpo\" \".deps/mainwindowideal.Po\"; else rm -f \
\".deps/mainwindowideal.Tpo\"; exit 1; fi",  "compiling", "g++", "mainwindowideal.cpp" )
+        << TestItem( // automake and libtool compiling *.c files
+                "if /bin/sh ../../libtool --silent --tag=CC --mode=compile gcc -DHAVE_CONFIG_H \
-I. -I. -I../.. -I../../lib/interfaces" +                "-I../../lib/util -I/opt/kde3/include \
-I/usr/lib/qt3/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT " +                \
"-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes \
-Wwrite-strings " +                "-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -g3 -fno-inline \
-Wformat-security -Wmissing-format-attribute -MT readtags.lo " +                "-MD -MP -MF \
\".deps/readtags.Tpo\" -c -o readtags.lo readtags.c; then mv -f \".deps/readtags.Tpo\" " +      \
"\".deps/readtags.Plo\"; else rm -f \".deps/readtags.Tpo\"; exit 1; fi", +                \
i18n("compiling"), "gcc", "readtags.c" )  << TestItem(
                 "source='makewidget.cpp' object='makewidget.lo' libtool=yes \
depfile='.deps/makewidget.Plo' "


[prev in list] [next in list] [prev in thread] [next in thread]