kdevelop/parts/outputviews

[Andras Mantia]

CVS commit by amantia: 

Recognize libtool --mode=install. The install tests are passed, but for some reasons it's not working correctly. I see directory navigation messages, "installing" messages and plain make output when runnin Install as root from Gideon.

CCMAIL: kdevelop-devel at kdevelop.org


  M +9 -4      makeactionfilter.cpp   1.19


--- kdevelop/parts/outputviews/makeactionfilter.cpp  #1.18:1.19
@@ -32,5 +32,4 @@ MakeActionFilter::MakeActionFilter( Outp
         : OutputFilter( next )
 {
-//#define DEBUG
 
 #ifdef DEBUG
@@ -55,5 +54,5 @@ MakeActionFilter::ActionFormat* MakeActi
                 ActionFormat( i18n("linking"), "g++", "g\\+\\+\\S* (?:\\S* )*-o ([^\\s;]+)", 1 ),
                 ActionFormat( i18n("linking"), "gcc", "g\\c\\c\\S* (?:\\S* )*-o ([^\\s;]+)", 1 ),
-                ActionFormat( i18n("installing"), "", "^/(?:usr/bin/install|bin/sh\\s.*mkinstalldirs).*\\s([^\\s;]+)", 1 ),
+                ActionFormat( i18n("installing"), "", "^/(?:usr/bin/install|bin/sh\\s.*mkinstalldirs|bin/sh\\s.*libtool.*--mode=install).*\\s([^\\s;]+)", 1 ),
                 ActionFormat( i18n("generating"), "dcopidl", "dcopidl .* > ([^\\s;]+)", 1 ),
                 ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ),
@@ -92,5 +91,5 @@ ActionItem* MakeActionFilter::matchLine(
         while ( !format->action.isNull() )
         {
-                kdDebug(9004) << "Testing filter: " << format->action << ": " << format->tool << endl;
+//              kdDebug(9004) << "Testing filter: " << format->action << ": " << format->tool << endl;
                 QRegExp& regExp = format->expression;
                 if ( regExp.search( line ) != -1 )
@@ -210,4 +209,10 @@ void MakeActionFilter::test()
                 "/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub KDevAppFrontendIface.kidl",
                 "compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" )
+        << TestItem( //install 
+                "/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop "
+                "/opt/kde3/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/kde3/share/applnk/Editors/kmdr-editor.desktop")
+        << TestItem( //libtool install 
+                "/bin/sh ../../libtool --silent --mode=install /usr/bin/install -c -p libkommanderwidgets.la "
+                "/opt/kde3/lib/libkommanderwidgets.la", "installing", "", "/opt/kde3/lib/libkommanderwidgets.la")
         ;
 
@@ -239,5 +244,5 @@ void MakeActionFilter::test()
                         kdError( 9004 ) << (*it).line << endl;
                 } else
-                kdDebug( 9004 ) << "Test passed, " << actionItem->m_file << " (" << actionItem->m_tool << ") found." << endl;
+                kdDebug( 9004 ) << "Test passed, " << actionItem->m_file << " (" << actionItem->m_action << ": " << actionItem->m_tool << ") found." << endl;
                 if ( actionItem != NULL )
                         delete actionItem;