rhythmbox r6180 - in trunk: . lib plugins tests

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Mar  7 08:16:35 2009
New Revision: 6180
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6180&view=rev

Log:
2009-03-07  Jonathan Matthew  <jonathan d14n org>

	* configure.ac:
	* lib/rb-file-helpers.c:
	Add SHARE_UNINSTALLED_BUILDDIR to handle cases where builddir !=
	srcdir.

	* plugins/rb-plugins-engine.c: (load_plugin_module):
	Missed a #define in the previous commit

	* tests/Makefile.am:
	Add podcast-upgrade.xml to EXTRA_DIST

	* tests/test-rhythmdb.c: (START_TEST):
	Find podcast-upgrade.xml relative to the source dir, rather than
	expecting it to be in the build dir.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/rb-file-helpers.c
   trunk/plugins/rb-plugins-engine.c
   trunk/tests/Makefile.am
   trunk/tests/test-rhythmdb.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Mar  7 08:16:35 2009
@@ -460,7 +460,8 @@
 	AC_DEFINE(USE_UNINSTALLED_DIRS, 1, [Define to look for files in source tree locations])
 fi
 ROOT_UNINSTALLED_DIR="`pwd`"
-AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_DIR,"`pwd`/data",[path to source data dir])
+AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_DIR,"`pwd`/$srcdir/data",[path to source data dir])
+AC_DEFINE_UNQUOTED(SHARE_UNINSTALLED_BUILDDIR,"`pwd`/data",[path to built source data dir])
 AC_DEFINE_UNQUOTED(METADATA_UNINSTALLED_DIR,"`pwd`/metadata",[path to metadata build dir])
 AC_SUBST(ROOT_UNINSTALLED_DIR)
 

Modified: trunk/lib/rb-file-helpers.c
==============================================================================
--- trunk/lib/rb-file-helpers.c	(original)
+++ trunk/lib/rb-file-helpers.c	Sat Mar  7 08:16:35 2009
@@ -54,6 +54,10 @@
 	SHARE_UNINSTALLED_DIR "/ui/",
 	SHARE_UNINSTALLED_DIR "/glade/",
 	SHARE_UNINSTALLED_DIR "/art/",
+	SHARE_UNINSTALLED_BUILDDIR "/",
+	SHARE_UNINSTALLED_BUILDDIR "/ui/",
+	SHARE_UNINSTALLED_BUILDDIR "/glade/",
+	SHARE_UNINSTALLED_BUILDDIR "/art/",
 	SHARE_DIR "/",
 	SHARE_DIR "/glade/",
 	SHARE_DIR "/art/",

Modified: trunk/plugins/rb-plugins-engine.c
==============================================================================
--- trunk/plugins/rb-plugins-engine.c	(original)
+++ trunk/plugins/rb-plugins-engine.c	Sat Mar  7 08:16:35 2009
@@ -462,7 +462,7 @@
 			g_return_val_if_fail (dirname != NULL, FALSE);
 
 			path = g_module_build_path (dirname, info->location);
-#ifdef SHARE_UNINSTALLED_DIR
+#ifdef USE_UNINSTALLED_DIRS
 			if (!g_file_test (path, G_FILE_TEST_EXISTS)) {
 				char *temp;
 

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Sat Mar  7 08:16:35 2009
@@ -80,4 +80,9 @@
 		$(TESTS)
 
 
-EXTRA_DIST = deserialization-test1.xml deserialization-test2.xml deserialization-test3.xml $(OLD_TESTS)
+EXTRA_DIST = 							\
+	deserialization-test1.xml 				\
+	deserialization-test2.xml 				\
+	deserialization-test3.xml 				\
+	podcast-upgrade.xml					\
+	$(OLD_TESTS)

Modified: trunk/tests/test-rhythmdb.c
==============================================================================
--- trunk/tests/test-rhythmdb.c	(original)
+++ trunk/tests/test-rhythmdb.c	Sat Mar  7 08:16:35 2009
@@ -407,7 +407,7 @@
 	const char *mountpoint;
 
 	/* load db with old podcasts setups */
-	g_object_set (G_OBJECT (db), "name", "podcast-upgrade.xml", NULL);
+	g_object_set (G_OBJECT (db), "name", SHARE_UNINSTALLED_DIR "/../tests/podcast-upgrade.xml", NULL);
 	set_waiting_signal (G_OBJECT (db), "load-complete");
 	rhythmdb_load (db);
 	wait_for_signal ();