SF.net SVN: geany:[4040] branches/build-system

[elextr at users.sourceforge.net]

Revision: 4040
          http://geany.svn.sourceforge.net/geany/?rev=4040&view=rev
Author:   elextr
Date:     2009-07-29 02:28:26 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Remove unused project structure fields and erroneous usage

Modified Paths:
--------------
    branches/build-system/ChangeLog
    branches/build-system/src/build.c
    branches/build-system/src/project.c
    branches/build-system/src/project.h

Modified: branches/build-system/ChangeLog
===================================================================
--- branches/build-system/ChangeLog	2009-07-28 21:02:34 UTC (rev 4039)
+++ branches/build-system/ChangeLog	2009-07-29 02:28:26 UTC (rev 4040)
@@ -1,3 +1,11 @@
+2009-07-29  Lex Trotman  <elextr(at)gmail(dot)com>
+
+ * src/project.h, src/project.c, src/build.c
+   Remove make_in_base_dir and run_cmd fields from project structure.
+   Replaced by build functionality.  Remove incorrect use in src/build.c
+   build_run_cmd function.
+
+
 2009-07-28  Lex Trotman  <elextr(at)gmail(dot)com>
 
  * src/project.h, src/project.c

Modified: branches/build-system/src/build.c
===================================================================
--- branches/build-system/src/build.c	2009-07-28 21:02:34 UTC (rev 4039)
+++ branches/build-system/src/build.c	2009-07-29 02:28:26 UTC (rev 4040)
@@ -743,7 +743,6 @@
 #ifdef HAVE_VTE
 	if (vte_info.load_vte && vc != NULL && vc->run_in_vte)
 	{
-		GeanyProject *project = app->project;
 		gchar *vte_cmd;
 
 		if (vc->skip_run_script)
@@ -755,9 +754,8 @@
 		else
 			vte_cmd = g_strconcat("\n/bin/sh ", RUN_SCRIPT_CMD, "\n", NULL);
 
-		/* change into current directory if it is not done by default or we have a project and
-		 * project run command(working_dir is already set accordingly) */
-		if (! vc->follow_path || (project != NULL && NZV(project->run_cmd)))
+		/* change into current directory if it is not done by default */
+		if (! vc->follow_path )
 		{
 			/* we need to convert the working_dir back to UTF-8 because the VTE expects it */
 			gchar *utf8_working_dir = utils_get_utf8_from_locale(working_dir);

Modified: branches/build-system/src/project.c
===================================================================
--- branches/build-system/src/project.c	2009-07-28 21:02:34 UTC (rev 4039)
+++ branches/build-system/src/project.c	2009-07-29 02:28:26 UTC (rev 4040)
@@ -76,8 +76,6 @@
 	GtkWidget *description;
 	GtkWidget *file_name;
 	GtkWidget *base_path;
-	GtkWidget *make_in_base_path;
-	GtkWidget *run_cmd;
 	GtkWidget *patterns;
 	TableData  build_properties;
 } PropertyDialogElements;
@@ -362,7 +360,6 @@
 	g_free(app->project->description);
 	g_free(app->project->file_name);
 	g_free(app->project->base_path);
-	g_free(app->project->run_cmd);
 
 	g_free(app->project);
 	app->project = NULL;
@@ -965,8 +962,6 @@
 	p->description = utils_get_setting_string(config, "project", "description", "");
 	p->file_name = utils_get_utf8_from_locale(filename);
 	p->base_path = utils_get_setting_string(config, "project", "base_path", "");
-	p->make_in_base_path = utils_get_setting_boolean(config, "project", "make_in_base_path", TRUE);
-	p->run_cmd = utils_get_setting_string(config, "project", "run_cmd", "");
 	p->file_patterns = g_key_file_get_string_list(config, "project", "file_patterns", NULL, NULL);
 
 	build_load_menu( config, BCS_PROJ, (gpointer)p );
@@ -1016,9 +1011,6 @@
 
 	if (p->description)
 		g_key_file_set_string(config, "project", "description", p->description);
-	g_key_file_set_boolean(config, "project", "make_in_base_path", p->make_in_base_path);
-	if (p->run_cmd)
-		g_key_file_set_string(config, "project", "run_cmd", p->run_cmd);
 	if (p->file_patterns)
 		g_key_file_set_string_list(config, "project", "file_patterns",
 			(const gchar**) p->file_patterns, g_strv_length(p->file_patterns));

Modified: branches/build-system/src/project.h
===================================================================
--- branches/build-system/src/project.h	2009-07-28 21:02:34 UTC (rev 4039)
+++ branches/build-system/src/project.h	2009-07-29 02:28:26 UTC (rev 4040)
@@ -35,12 +35,10 @@
 	gchar *description; 	/**< Short description of the project. */
 	gchar *file_name; 		/**< Where the project file is stored (in UTF-8). */
 	gchar *base_path;		/**< Base path of the project directory (in UTF-8, maybe relative). */
-	gchar *run_cmd; 		/**< Project run command (in UTF-8). */
 	/** Identifier whether it is a pure Geany project or modified/extended
 	 * by a plugin. */
 	gint type;
 	gchar **file_patterns;	/**< Array of filename extension patterns. */
-	gboolean make_in_base_path;
 	GPtrArray *build_filetypes_list; /**< Project has custom filetype builds for these. */
 
 	struct GeanyProjectPrivate	*priv;	/* must be last, append fields before this item */


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