SF.net SVN: geany: [1045] trunk

[eht16 at users.sourceforge.net]

Revision: 1045
          http://svn.sourceforge.net/geany/?rev=1045&view=rev
Author:   eht16
Date:     2006-12-03 14:43:09 -0800 (Sun, 03 Dec 2006)

Log Message:
-----------
Applied patch from Bob Doan to ignore libtool messages when parsing the output of make (thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/msgwindow.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-03 22:33:46 UTC (rev 1044)
+++ trunk/ChangeLog	2006-12-03 22:43:09 UTC (rev 1045)
@@ -8,6 +8,8 @@
    src/prefs.c, src/sci_cb.c:
    Added new preference to unfold all children of a fold point if the
    fold point is unfolded.
+ * src/msgwindow.c: Applied patch from Bob Doan to ignore libtool
+                    messages when parsing the output of make (thanks).
 
 
 2006-12-02  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/msgwindow.c
===================================================================
--- trunk/src/msgwindow.c	2006-12-03 22:33:46 UTC (rev 1044)
+++ trunk/src/msgwindow.c	2006-12-03 22:43:09 UTC (rev 1045)
@@ -532,11 +532,15 @@
 		case GEANY_FILETYPES_MAKE:	// Assume makefile is building with gcc
 		default:	// The default is a GNU gcc type error
 		{
-			data.pattern = ":";
-			data.min_fields = 3;
-			data.line_idx = 1;
-			data.file_idx = 0;
-			break;
+			// don't accidently find libtool versions x:y:x and think it is a file name
+			if (strstr(string, "libtool --mode=link") == NULL)
+			{
+				data.pattern = ":";
+				data.min_fields = 3;
+				data.line_idx = 1;
+				data.file_idx = 0;
+				break;
+			}
 		}
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.