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

List:       kde-commits
Subject:    kdevelop/parts/outputviews
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-05-17 14:47:36
Message-ID: 20040517144736.411AC9265 () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Recgonize the compiled source file with automake 1.8.3. I've tested and it doesn't break any \
existing test case.  Add a note for hackers.


  M +26 -7     makeactionfilter.cpp   1.22


--- kdevelop/parts/outputviews/makeactionfilter.cpp  #1.21:1.22
@@ -39,4 +39,7 @@ MakeActionFilter::MakeActionFilter( Outp
 }
 
+//NOTE: whenever you discover a case that is not correctly recognized by the filter, please \
add it as a test +//item and be sure that your modifications don't break the already existing \
test cases. +
 // returns an array of ActionFormat
 MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
@@ -44,5 +47,5 @@ MakeActionFilter::ActionFormat* MakeActi
         static ActionFormat formats[] = {
                 ActionFormat( i18n("compiling"), "g++", "g\\+\\+\\S* (?:\\S* )*-c (?:\\S* \
                )*`[^`]*`(?:[^/\\s;]*/)*([^/\\s;]+)", 1 ),
-                ActionFormat( i18n("compiling"), "g++", "g\\+\\+\\S* (?:\\S* )*-c (?:\\S* \
)*(?:[^/]*/)*([^/\\s;]*)", 1 ), +                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* \
)*(?:[^/]*/)*([^/\\s;]*)", 1 ), @@ -97,5 +100,7 @@ ActionItem* MakeActionFilter::matchLine(
                 if ( regExp.search( line ) != -1 )
                 {
-                   return new ActionItem( format->action, regExp.cap( format->fileGroup ), \
format->tool, line ); +                   ActionItem *actionItem = new ActionItem( \
format->action, regExp.cap( format->fileGroup ), format->tool, line ); +                   \
kdDebug( 9004 ) << "Found: " << actionItem->m_action << " " << actionItem->m_file << "(" << \
actionItem->m_tool << ")" << endl; +                   return actionItem;
                 } 
 #ifdef DEBUG
@@ -217,4 +222,18 @@ void MakeActionFilter::test()
                 "/bin/sh ../../libtool --silent --mode=install /usr/bin/install -c -p \
                libkommanderwidgets.la "
                 "/opt/kde3/lib/libkommanderwidgets.la", "installing", "", \
"/opt/kde3/lib/libkommanderwidgets.la") +        << TestItem( //libtool, automake 1.8
+        "if g++ -DHAVE_CONFIG_H -I. -I/home/andris/  "
+        "-DBUILD_KAFKAPART  -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o \
quanta_init.o " +        "quanta_init.cpp; "
+        "then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \
\".deps/quanta_init.Tpo\"; " +        "exit 1; fi",
+        "compiling", "g++", "quanta_init.cpp")
+        << TestItem( //libtool, automake 1.8, file with full path
+        "if g++ -DHAVE_CONFIG_H -I. -I/home/andris/  "
+        "-DBUILD_KAFKAPART  -MT quanta_init.o -MD -MP -MF \".deps/quanta_init.Tpo\" -c -o \
quanta_init.o " +        "/home/andris/quanta_init.cpp; "
+        "then mv -f \".deps/quanta_init.Tpo\" \".deps/quanta_init.Po\"; else rm -f \
\".deps/quanta_init.Tpo\"; " +        "exit 1; fi",
+        "compiling", "g++", "quanta_init.cpp")
         ;
 
@@ -246,5 +265,5 @@ void MakeActionFilter::test()
                         kdError( 9004 ) << (*it).line << endl;
                 } else
-                kdDebug( 9004 ) << "Test passed, " << actionItem->m_file << " (" << \
actionItem->m_action << ": " << actionItem->m_tool << ") found." << endl; +                \
kdDebug( 9004 ) << "Test passed, " << actionItem->m_action << " " << actionItem->m_file << " (" \
<< actionItem->m_tool << ") found." << endl;  if ( actionItem != NULL )
                         delete actionItem;


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