GNOME.org
 

[anjuta] am-project: bgo #638368 - test-suite fails

commit 2279c6959e8c63e5ebb9de7b17861e0156cd94f9
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Fri Dec 31 20:15:09 2010 +0100

    am-project: bgo #638368 - test-suite fails

 plugins/am-project/Makefile.am      |    5 ++---
 plugins/am-project/am-properties.c  |    2 ++
 plugins/am-project/amp-module.c     |    3 ++-
 plugins/am-project/amp-node.c       |    2 +-
 plugins/am-project/tests/anjuta.lst |   24 +++++++++++++++++++-----
 5 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/plugins/am-project/Makefile.am b/plugins/am-project/Makefile.am
index e956fb5..fe7e2e1 100644
--- a/plugins/am-project/Makefile.am
+++ b/plugins/am-project/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tests
+SUBDIRS = . tests
 
 # Plugin UI file
 plugin_uidir = $(anjuta_ui_dir)
@@ -96,8 +96,7 @@ projectparser_SOURCES = \
 	projectparser.c
 
 projectparser_LDADD = \
-	libam-project.la \
-	$(LIBANJUTA_LIBS)
+	libam-project.la
 
 
 EXTRA_DIST = \
diff --git a/plugins/am-project/am-properties.c b/plugins/am-project/am-properties.c
index dea2fd2..90b7e54 100644
--- a/plugins/am-project/am-properties.c
+++ b/plugins/am-project/am-properties.c
@@ -965,6 +965,8 @@ static const gchar *
 am_node_property_find_flags (AnjutaProjectProperty *prop, const gchar *value, gsize len)
 {
 	const gchar *found;
+
+	g_return_val_if_fail (prop != NULL, NULL);
 	
 	for (found = prop->value; found != NULL;)
 	{
diff --git a/plugins/am-project/amp-module.c b/plugins/am-project/amp-module.c
index 50737ff..380b66c 100644
--- a/plugins/am-project/amp-module.c
+++ b/plugins/am-project/amp-module.c
@@ -226,7 +226,7 @@ amp_module_node_erase (AmpNode *node, AmpNode *amp_parent, AmpProject *project,
 			}
 		}
 					
-		type = anjuta_project_node_get_full_type (ANJUTA_PROJECT_NODE (node)) & (ANJUTA_PROJECT_ID_MASK | ANJUTA_PROJECT_TYPE_MASK);
+		type = anjuta_project_node_get_full_type (ANJUTA_PROJECT_NODE (parent)) & (ANJUTA_PROJECT_ID_MASK | ANJUTA_PROJECT_TYPE_MASK);
 		switch (type)
 		{
 		case ANJUTA_PROJECT_TARGET | ANJUTA_PROJECT_PROGRAM:
@@ -237,6 +237,7 @@ amp_module_node_erase (AmpNode *node, AmpNode *amp_parent, AmpProject *project,
 			target_lib = amp_node_get_property_from_token (parent, AM_TOKEN_TARGET_LIBADD);
 			break;
 		default:
+			target_lib = NULL;
 			break;
 		}
 		target_cpp = amp_node_get_property_from_token (parent, AM_TOKEN_TARGET_CPPFLAGS);
diff --git a/plugins/am-project/amp-node.c b/plugins/am-project/amp-node.c
index 6e1e78d..13e1d23 100644
--- a/plugins/am-project/amp-node.c
+++ b/plugins/am-project/amp-node.c
@@ -61,7 +61,7 @@ amp_node_new (AnjutaProjectNode *parent, AnjutaProjectNodeType type, GFile *file
 			node = ANJUTA_PROJECT_NODE (amp_group_node_new (file, FALSE, error));
 			break;
 		case ANJUTA_PROJECT_TARGET:
-			node = ANJUTA_PROJECT_NODE (amp_target_node_new (name, 0, NULL, 0, error));
+			node = ANJUTA_PROJECT_NODE (amp_target_node_new (name, type, NULL, 0, error));
 			break;
 		case ANJUTA_PROJECT_SOURCE:
 			if ((file == NULL) && (name != NULL))
diff --git a/plugins/am-project/tests/anjuta.lst b/plugins/am-project/tests/anjuta.lst
index ff10a7a..939a018 100644
--- a/plugins/am-project/tests/anjuta.lst
+++ b/plugins/am-project/tests/anjuta.lst
@@ -557,13 +557,25 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (14:5:0:5:14): plugins/am-project/am-project-private.h
                     SOURCE (14:5:0:5:15): plugins/am-project/am-properties.c
                     SOURCE (14:5:0:5:16): plugins/am-project/am-properties.h
-                    SOURCE (14:5:0:5:17): plugins/am-project/am-node.c
-                    SOURCE (14:5:0:5:18): plugins/am-project/am-node.h
-                    SOURCE (14:5:0:5:19): plugins/am-project/command-queue.c
-                    SOURCE (14:5:0:5:20): plugins/am-project/command-queue.h
+                    SOURCE (14:5:0:5:17): plugins/am-project/amp-node.c
+                    SOURCE (14:5:0:5:18): plugins/am-project/amp-node.h
+                    SOURCE (14:5:0:5:19): plugins/am-project/amp-root.c
+                    SOURCE (14:5:0:5:20): plugins/am-project/amp-root.h
+                    SOURCE (14:5:0:5:21): plugins/am-project/amp-module.h
+                    SOURCE (14:5:0:5:22): plugins/am-project/amp-module.c
+                    SOURCE (14:5:0:5:23): plugins/am-project/amp-package.h
+                    SOURCE (14:5:0:5:24): plugins/am-project/amp-package.c
+                    SOURCE (14:5:0:5:25): plugins/am-project/amp-group.h
+                    SOURCE (14:5:0:5:26): plugins/am-project/amp-group.c
+                    SOURCE (14:5:0:5:27): plugins/am-project/amp-target.h
+                    SOURCE (14:5:0:5:28): plugins/am-project/amp-target.c
+                    SOURCE (14:5:0:5:29): plugins/am-project/amp-source.h
+                    SOURCE (14:5:0:5:30): plugins/am-project/amp-source.c
+                    SOURCE (14:5:0:5:31): plugins/am-project/command-queue.c
+                    SOURCE (14:5:0:5:32): plugins/am-project/command-queue.h
                 TARGET (14:5:0:6): projectparser
                     PROPERTY (Do not install): true
-                    PROPERTY (Libraries): libam-project.la $(LIBANJUTA_LIBS)
+                    PROPERTY (Libraries): libam-project.la
                     SOURCE (14:5:0:6:0): plugins/am-project/projectparser.c
             GROUP (14:5:1): build-basic-autotools
                 PROPERTY (Installation directories): build_gladedir = $(anjuta_glade_dir) build_uidir = $(anjuta_ui_dir) build_pixmapsdir = $(anjuta_image_dir) build_plugindir = $(anjuta_plugin_dir) build_datadir = $(anjuta_data_dir)/build plugindir = $(anjuta_plugin_dir)
@@ -613,6 +625,7 @@ PROPERTY (URL): http://www.anjuta.org/
                         SOURCE (14:5:2:1:0:3): plugins/class-gen/templates/go-source.tpl
                         SOURCE (14:5:2:1:0:4): plugins/class-gen/templates/js-source.tpl
                         SOURCE (14:5:2:1:0:5): plugins/class-gen/templates/py-source.tpl
+                        SOURCE (14:5:2:1:0:6): plugins/class-gen/templates/vala-source.tpl
                 TARGET (14:5:2:0): clsgen_glade
                     PROPERTY (Installation directory): clsgen_gladedir
                     SOURCE (14:5:2:0:0): plugins/class-gen/anjuta-class-gen-plugin.ui
@@ -1456,6 +1469,7 @@ PROPERTY (URL): http://www.anjuta.org/
                     SOURCE (14:5:20:0:0): plugins/language-support-vala/$(plugin_in_files:.plugin.in=.plugin)
                 TARGET (14:5:20:1): libanjuta-language-vala.la
                     PROPERTY (Installation directory): plugindir
+                    PROPERTY (Vala compiler flags): --pkg libvala-0.12 --pkg libanjuta-3.0
                     PROPERTY (Linker flags): $(ANJUTA_PLUGIN_LDFLAGS)
                     PROPERTY (Libraries): $(LIBANJUTA_LIBS) $(VALA_LIBS)
                     MODULE (14:5:20:1:4): VALA
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]