anjuta r3575 - in trunk: . plugins/build-basic-autotools

[jhs svn gnome org]

Author: jhs
Date: Sat Feb  2 09:54:15 2008
New Revision: 3575
URL: http://svn.gnome.org/viewvc/anjuta?rev=3575&view=rev

Log:
2008-02-02  Johannes Schmid <jhs gnome org>

	* plugins/build-basic-autotools/build-basic-autotools.c:
	(on_build_mesg_format):
	
	Also check for untranslated messages from make. Should fix 
	#511981 â Error parsing make output

Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade
   trunk/plugins/build-basic-autotools/build-basic-autotools.c

Modified: trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade
==============================================================================
--- trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade	(original)
+++ trunk/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.glade	Sat Feb  2 09:54:15 2008
@@ -42,16 +42,13 @@
                   <widget class="GtkHBox" id="hbox27">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkLabel" id="label104">
+                      <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="yalign">0</property>
-                        <property name="xpad">5</property>
-                        <property name="label" translatable="yes">Arguments: </property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="label" translatable="yes">Arguments:</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                       </packing>
                     </child>
                     <child>
@@ -94,7 +91,7 @@
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Program execution:&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Select Program to run:&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </widget>
               <packing>

Modified: trunk/plugins/build-basic-autotools/build-basic-autotools.c
==============================================================================
--- trunk/plugins/build-basic-autotools/build-basic-autotools.c	(original)
+++ trunk/plugins/build-basic-autotools/build-basic-autotools.c	Sat Feb  2 09:54:15 2008
@@ -563,7 +563,11 @@
 	if ((sscanf (one_line, _("make[%d]: Entering directory '%s'"), &dummy_int, dir) == 2) ||
 		(sscanf (one_line, _("make: Entering directory '%s'"), dir) == 1) ||
 		(sscanf (one_line, _("make[%d]: Entering directory `%s'"), &dummy_int, dir) == 2) ||
-		(sscanf (one_line, _("make: Entering directory `%s'"), dir) == 1))
+		(sscanf (one_line, _("make: Entering directory `%s'"), dir) == 1) ||
+		(sscanf (one_line, "make[%d]: Entering directory '%s'", &dummy_int, dir) == 2) ||
+		(sscanf (one_line, "make: Entering directory '%s'", dir) == 1) ||
+		(sscanf (one_line, "make[%d]: Entering directory `%s'", &dummy_int, dir) == 2) ||
+		(sscanf (one_line, "make: Entering directory `%s'", dir) == 1))
 	{
 		gchar* summary;
 		/* FIXME: Hack to remove the last ' */
@@ -585,7 +589,12 @@
 	if ((sscanf (one_line, _("make[%d]: Leaving directory '%s'"), &dummy_int, dir) == 2) ||
 		(sscanf (one_line, _("make: Leaving directory '%s'"), dir) == 1) ||
 		(sscanf (one_line, _("make[%d]: Leaving directory `%s'"), &dummy_int, dir) == 2) ||
-		(sscanf (one_line, _("make: Leaving directory `%s'"), dir) == 1))
+		(sscanf (one_line, _("make: Leaving directory `%s'"), dir) == 1) ||
+		(sscanf (one_line, "make[%d]: Leaving directory '%s'", &dummy_int, dir) == 2) ||
+		(sscanf (one_line, "make: Leaving directory '%s'", dir) == 1) ||
+		(sscanf (one_line, "make[%d]: Leaving directory `%s'", &dummy_int, dir) == 2) ||
+		(sscanf (one_line, "make: Leaving directory `%s'", dir) == 1))
+
 	{
 		gchar* summary;
 		/* FIXME: Hack to remove the last ' */