Revision: 1804 http://geany.svn.sourceforge.net/geany/?rev=1804&view=rev Author: ntrel Date: 2007-08-16 07:54:31 -0700 (Thu, 16 Aug 2007)
Log Message: ----------- Apply patch from Jon Senior to fix parsing Apache Ant compiler error messages (thanks).
Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-08-16 13:53:06 UTC (rev 1803) +++ trunk/ChangeLog 2007-08-16 14:54:31 UTC (rev 1804) @@ -1,3 +1,10 @@ +2007-08-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/msgwindow.c: + Apply patch from Jon Senior to fix parsing Apache Ant compiler + error messages (thanks). + + 2007-08-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* scintilla/PositionCache.cxx:
Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2007-08-16 13:53:06 UTC (rev 1803) +++ trunk/src/msgwindow.c 2007-08-16 14:54:31 UTC (rev 1804) @@ -733,26 +733,26 @@ case GEANY_FILETYPES_ALL: default: // The default is a GNU gcc type error { - // 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; - } if (build_info.file_type_id == GEANY_FILETYPES_JAVA && strncmp(string, "[javac]", 7) == 0) { /* Java Apache Ant. * [javac] <Full Path to File + extension>:<line n°>: <error> */ data.pattern = " :"; - data.min_fields = 3; + data.min_fields = 4; data.line_idx = 2; data.file_idx = 1; 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.