beagle r4872 - in branches/beagle-abock-branch: . beagled

[abock svn gnome org]

Author: abock
Date: Sat Oct 11 03:52:56 2008
New Revision: 4872
URL: http://svn.gnome.org/viewvc/beagle?rev=4872&view=rev

Log:
Build integration for the new Banshee Queryable

Modified:
   branches/beagle-abock-branch/beagled/Makefile.am
   branches/beagle-abock-branch/configure.in

Modified: branches/beagle-abock-branch/beagled/Makefile.am
==============================================================================
--- branches/beagle-abock-branch/beagled/Makefile.am	(original)
+++ branches/beagle-abock-branch/beagled/Makefile.am	Sat Oct 11 03:52:56 2008
@@ -403,6 +403,38 @@
 
 ############################################################
 
+###
+### Banshee backend
+###
+
+BANSHEE_DIR = $(srcdir)/BansheeQueryable
+
+BANSHEE_TARGET = BansheeBackends.dll
+
+BANSHEE_CSFLAGS = $(BACKEND_CSFLAGS)
+
+BANSHEE_CSFILES =						\
+	$(BANSHEE_DIR)/BansheeQueryable.cs			\
+	$(BANSHEE_DIR)/BansheeIndexer.cs 		\
+	$(BANSHEE_DIR)/BansheeIndexableGenerator.cs
+
+BANSHEE_LOCAL_ASSEMBLIES =					\
+	../Util/Util.dll					\
+	../BeagleClient/Beagle.dll				\
+	./BeagleDaemonLib.dll
+
+BANSHEE_ASSEMBLIES =						\
+	-r:Mono.Posix						\
+	$(BEAGLED_LIBS)                 			\
+	$(BANSHEE_INDEXER_LIBS)					\
+	$(BANSHEE_LOCAL_ASSEMBLIES:%=-r:%)
+
+$(BANSHEE_TARGET): $(BANSHEE_CSFILES) $(BANSHEE_LOCAL_ASSEMBLIES)
+	$(CSC) -out:$@ $(BANSHEE_CSFLAGS) $(BANSHEE_CSFILES) $(BANSHEE_ASSEMBLIES)
+
+
+############################################################
+
 ### GMail and other Google backends
 
 XEMAIL_DIR = $(srcdir)/xemail-net/src
@@ -766,6 +798,10 @@
 ALL_TARGETS += $(THUNDERBIRD_TARGET)
 endif
 
+if ENABLE_BANSHEE
+ALL_TARGETS += $(BANSHEE_TARGET)
+endif
+
 if ENABLE_EVOLUTION
 ALL_TARGETS +=				\
 	$(EVO_DLL_TARGET)
@@ -837,12 +873,26 @@
 if ENABLE_GOOGLEBACKENDS
 	$(INSTALL_DATA) $(GOOGLE_BACKEND_TARGET) $(GOOGLE_BACKEND_TARGET).mdb $(DESTDIR)$(BACKENDDIR)
 endif
+if ENABLE_BANSHEE
+	$(INSTALL_DATA) $(BANSHEE_TARGET)                 $(DESTDIR)$(BACKENDDIR)
+	$(INSTALL_DATA) $(BANSHEE_TARGET).mdb             $(DESTDIR)$(BACKENDDIR)
+	for ASM in $(BANSHEE_INDEXER_ASSEMBLIES); do \
+		$(INSTALL_DATA) $$ASM $(DESTDIR)$(BACKENDDIR); \
+	done;
+endif
 
 uninstall-local:
 if ENABLE_THUNDERBIRD
 	rm -f $(DESTDIR)$(BACKENDDIR)/$(THUNDERBIRD_TARGET)
 	rm -f $(DESTDIR)$(BACKENDDIR)/$(THUNDERBIRD_TARGET).mdb
 endif
+if ENABLE_BANSHEE
+	rm -f $(DESTDIR)$(BACKENDDIR)/$(BANSHEE_TARGET)
+	rm -f $(DESTDIR)$(BACKENDDIR)/$(BANSHEE_TARGET).mdb
+	for ASM in $(BANSHEE_INDEXER_ASSEMBLIES); do \
+		rm -f $(DESTDIR)$(BACKENDDIR)/`basename $$ASM`; \
+	done;
+endif
 if ENABLE_EVOLUTION
 	rm -f $(DESTDIR)$(BACKENDDIR)/$(EVO_DLL_TARGET)
 	rm -f $(DESTDIR)$(BACKENDDIR)/$(EVO_DLL_TARGET).mdb
@@ -912,6 +962,7 @@
 	$(DAEMON_CSFILES)			\
 	$(EVO_DLL_CSFILES)			\
 	$(THUNDERBIRD_CSFILES)			\
+	$(BANSHEE_CSFILES)			\
 	$(GOOGLE_BACKEND_CSFILES)		\
 	$(EXTRACT_CONTENT_CSFILES)		\
 	$(DUMP_INDEX_CSFILES)			\
@@ -958,6 +1009,8 @@
 	$(REMOVABLE_INDEX_WRAPPER)			\
 	$(THUNDERBIRD_TARGET)			\
 	$(THUNDERBIRD_TARGET).mdb		\
+	$(BANSHEE_TARGET)			\
+	$(BANSHEE_TARGET).mdb			\
 	$(GOOGLE_BACKEND_TARGET)		\
 	$(GOOGLE_BACKEND_TARGET).mdb		\
 	$(WEBINTERFACE_INDEX_XML)

Modified: branches/beagle-abock-branch/configure.in
==============================================================================
--- branches/beagle-abock-branch/configure.in	(original)
+++ branches/beagle-abock-branch/configure.in	Sat Oct 11 03:52:56 2008
@@ -22,6 +22,7 @@
 GSF_SHARP_REQUIRED=0.6
 GTK_REQUIRED=2.10.0
 AVAHI_SHARP_REQUIRED=0.6.10
+BANSHEE_REQUIRED=1.3.2
 
 ########################################################################
 
@@ -572,6 +573,26 @@
 AM_CONDITIONAL(ENABLE_QT, test "x$enable_qt" = "xyes")
 AC_SUBST(QYOTO_ASSEMBLY)
 
+dnl -------------------------------------------------------
+
+AC_ARG_ENABLE([banshee],
+	AC_HELP_STRING([--disable-banshee], [Disable Banshee indexing]),
+	enable_banshee=$enableval,
+	enable_banshee=yes)
+
+AM_CONDITIONAL(ENABLE_BANSHEE, test "x$enable_banshee" = "xyes")
+
+if test "x$enable_banshee" = "xyes"; then
+	PKG_CHECK_MODULES(BANSHEE_INDEXER,
+		banshee-1-collection-indexer >= $BANSHEE_REQUIRED
+		ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
+	asms=`$PKG_CONFIG --variable=Libraries banshee-1-collection-indexer`
+	for asm in $asms; do
+		BANSHEE_INDEXER_ASSEMBLIES="$BANSHEE_INDEXER_ASSEMBLIES $asm $asm.mdb"
+	done
+	AC_SUBST(BANSHEE_INDEXER_ASSEMBLIES)
+fi
+
 dnl ----------------------------------------------
 
 dnl Monodoc
@@ -677,6 +698,7 @@
 	Firefox Extension?	  yes
 	Epiphany Extension?	  ${enable_epiphany_extension}
 	Thunderbird Extension? 	  ${enable_tbird}
+	Banshee Backend? 	  ${enable_banshee}
 	Google Backends?          ${enable_google}
 
 	Monitor screensaver       ${have_xss}