anjuta r4113 - in trunk: . plugins/build-basic-autotools plugins/sourceview

[sgranjoux svn gnome org]

Author: sgranjoux
Date: Mon Aug  4 17:43:09 2008
New Revision: 4113
URL: http://svn.gnome.org/viewvc/anjuta?rev=4113&view=rev

Log:
	* plugins/sourceview/sourceview-io.c,
	plugins/build-basic-autotools/plugin.c:
	Fix #543149 Project doesn't rebuild when file is changed


Modified:
   trunk/ChangeLog
   trunk/plugins/build-basic-autotools/plugin.c
   trunk/plugins/sourceview/sourceview-io.c

Modified: trunk/plugins/build-basic-autotools/plugin.c
==============================================================================
--- trunk/plugins/build-basic-autotools/plugin.c	(original)
+++ trunk/plugins/build-basic-autotools/plugin.c	Mon Aug  4 17:43:09 2008
@@ -128,6 +128,9 @@
 	
 	/* Environment */
 	IAnjutaEnvironment *environment;
+
+	/* Saved files */
+	gint file_saved;
 } BuildContext;
 
 /* Declarations */
@@ -1122,64 +1125,67 @@
 	}
 }
 
-static gboolean
-build_execute_command_in_context (BuildContext* context, BuildProgram *prog,
-								  GError **err)
+static void
+build_set_command_in_context (BuildContext* context, BuildProgram *prog)
 {
-	AnjutaPreferences* prefs = anjuta_shell_get_preferences (context->plugin->shell, NULL);
-
 	if (context->program != NULL)
 		build_program_free (context->program);
 	context->program = prog;
 	context->used = TRUE;
+}
+
+static gboolean
+build_execute_command_in_context (BuildContext* context, GError **err)
+{
+	AnjutaPreferences* prefs = anjuta_shell_get_preferences (context->plugin->shell, NULL);
 	
 	/* Send options to make */
-	if (strcmp (build_program_get_basename (prog), "make") == 0)
+	if (strcmp (build_program_get_basename (context->program), "make") == 0)
 	{
 		if (!anjuta_preferences_get_int (prefs , PREF_TRANSLATE_MESSAGE))
 		{
-			build_program_add_env (prog, "LANGUAGE", "C");
+			build_program_add_env (context->program, "LANGUAGE", "C");
 		}
 		if (anjuta_preferences_get_int (prefs , PREF_PARALLEL_MAKE))
 		{
 			gchar *arg = g_strdup_printf ("-j%d", anjuta_preferences_get_int (prefs , PREF_PARALLEL_MAKE_JOB));
-			build_program_insert_arg (prog, 1, arg);
+			build_program_insert_arg (context->program, 1, arg);
 			g_free (arg);
 		}
 		if (anjuta_preferences_get_int (prefs , PREF_CONTINUE_ON_ERROR))
 		{
-			build_program_insert_arg (prog, 1, "-k");
+			build_program_insert_arg (context->program, 1, "-k");
 		}
 	}
 	
-	build_program_override (prog, context->environment);
+	build_program_override (context->program, context->environment);
 	
 	/* Add current directory */
-	build_program_add_env (prog, "PWD", prog->work_dir);
+	build_program_add_env (context->program, "PWD", context->program->work_dir);
 	
 	if (context->message_view)
 	{
 		gchar *command;
 		
-		command = g_strjoinv (" ", prog->argv);
+		command = g_strjoinv (" ", context->program->argv);
 		ianjuta_message_view_buffer_append (context->message_view,
 										"Building in directory: ", NULL);
-		ianjuta_message_view_buffer_append (context->message_view, prog->work_dir, NULL);
+		ianjuta_message_view_buffer_append (context->message_view, context->program->work_dir, NULL);
 		ianjuta_message_view_buffer_append (context->message_view, "\n", NULL);
 		ianjuta_message_view_buffer_append (context->message_view, command, NULL);
 		ianjuta_message_view_buffer_append (context->message_view, "\n", NULL);
 		g_free (command);
 	
 		anjuta_launcher_execute_v (context->launcher,
-								   prog->argv,
-								   prog->envp,
+								   context->program->argv,
+								   context->program->envp,
 								   on_build_mesg_arrived, context);
 	}
 	else
 	{
 		anjuta_launcher_execute_v (context->launcher,
-								   prog->argv,
-								   prog->envp,
+								   context->program->argv,
+								   context->program->envp,
 								   NULL, NULL);
 	}		
 	
@@ -1211,7 +1217,8 @@
 	
 	context = build_get_context (bplugin, prog->work_dir, with_view);
 
-	ok = build_execute_command_in_context (context, prog, err);
+	build_set_command_in_context (context, prog);
+	ok = build_execute_command_in_context (context, err);
 	
 	if (ok)
 	{
@@ -1225,30 +1232,61 @@
 	}
 }
 
+static void
+build_delayed_execute_command (IAnjutaFileSavable *savable, GFile *file, gpointer user_data)
+{
+	BuildContext *context = (BuildContext *)user_data;
+
+	if (savable != NULL)
+	{
+		g_signal_handlers_disconnect_by_func (savable, G_CALLBACK (build_delayed_execute_command), user_data); 
+		context->file_saved--;
+	}	
+	
+	if (context->file_saved == 0)
+	{
+		build_execute_command_in_context (context, NULL);
+	}
+}
+
 static BuildContext*
 build_save_and_execute_command (BasicAutotoolsPlugin* bplugin, BuildProgram *prog,
 								gboolean with_view, GError **err)
 {
 	AnjutaPlugin* plugin = ANJUTA_PLUGIN(bplugin);
 	BuildContext *context;
-	gboolean ok;
-	
+	IAnjutaDocumentManager *docman;
+
 	context = build_get_context (bplugin, prog->work_dir, with_view);
+	build_set_command_in_context (context, prog);
+	context->file_saved = 0;
 
-	save_all_files (ANJUTA_PLUGIN (plugin));
-	
-	ok = build_execute_command_in_context (context, prog, err);
-	
-	if (ok)
-	{
-		return context;
-	}
-	else
+	docman = anjuta_shell_get_interface (plugin->shell, IAnjutaDocumentManager, NULL);
+	/* No document manager, so no file to save */
+	if (docman != NULL)
 	{
-		build_context_destroy (context);
-		
-		return NULL;
+		GList *doc_list = ianjuta_document_manager_get_doc_widgets (docman, NULL);
+		GList *node;
+
+		for (node = g_list_first (doc_list); node != NULL; node = g_list_next (node))
+		{
+			if (IANJUTA_IS_FILE_SAVABLE (node->data))
+			{
+				IAnjutaFileSavable* save = IANJUTA_FILE_SAVABLE (node->data);
+				if (ianjuta_file_savable_is_dirty (save, NULL))
+				{
+					context->file_saved++;
+					g_signal_connect (G_OBJECT (save), "saved", G_CALLBACK (build_delayed_execute_command), context);
+					ianjuta_file_savable_save (save, NULL);
+				}
+			}
+		}
+		g_list_free (doc_list);		
 	}
+	
+	build_delayed_execute_command (NULL, NULL, context);
+	
+	return context;
 }
 
 static void
@@ -1615,7 +1653,8 @@
 													   (gchar *)user_data);
 				build_program_set_callback (prog, build_project_configured, NULL);
 		
-				build_execute_command_in_context ((BuildContext *)context, prog, NULL);
+				build_set_command_in_context (context, prog);
+				build_execute_command_in_context (context, NULL);
 			}
 		}
 		g_free (filename);

Modified: trunk/plugins/sourceview/sourceview-io.c
==============================================================================
--- trunk/plugins/sourceview/sourceview-io.c	(original)
+++ trunk/plugins/sourceview/sourceview-io.c	Mon Aug  4 17:43:09 2008
@@ -226,8 +226,8 @@
 	else
 	{
 		set_display_name (sio);
-		g_signal_emit_by_name (sio, "save-finished");
 		g_output_stream_close(G_OUTPUT_STREAM (output_stream), NULL, NULL);
+		g_signal_emit_by_name (sio, "save-finished");
 		setup_monitor (sio);
 	}
 	g_free (sio->write_buffer);