beagle r4744 - in trunk/beagle: Util beagled beagled/GoogleBackends beagled/LocateQueryable

[dbera svn gnome org]

Author: dbera
Date: Sat May  3 00:15:27 2008
New Revision: 4744
URL: http://svn.gnome.org/viewvc/beagle?rev=4744&view=rev

Log:
RDF Adapter merge #4: Fix build with --enable-rdf-adapter.


Modified:
   trunk/beagle/Util/Makefile.am
   trunk/beagle/beagled/GoogleBackends/GMailSearchDriver.cs
   trunk/beagle/beagled/LocateQueryable/LocateDriver.cs
   trunk/beagle/beagled/Makefile.am

Modified: trunk/beagle/Util/Makefile.am
==============================================================================
--- trunk/beagle/Util/Makefile.am	(original)
+++ trunk/beagle/Util/Makefile.am	Sat May  3 00:15:27 2008
@@ -163,7 +163,7 @@
 	$(srcdir)/QueryKeywordMapping.cs
 
 if ENABLE_RDF_ADAPTER
-UTIL_CSFILES +=
+UTIL_CSFILES +=					\
 	$(srcdir)/SemWeb/Euler.cs
 endif
 
@@ -270,6 +270,7 @@
 COND_CS_FILES =				\
 	$(srcdir)/AvahiBrowser.cs	\
 	$(srcdir)/ChmFile.cs		\
+	$(srcdir)/Euler.cs		\
 	$(srcdir)/Galago.cs		\
 	$(srcdir)/Thunderbird.cs
 

Modified: trunk/beagle/beagled/GoogleBackends/GMailSearchDriver.cs
==============================================================================
--- trunk/beagle/beagled/GoogleBackends/GMailSearchDriver.cs	(original)
+++ trunk/beagle/beagled/GoogleBackends/GMailSearchDriver.cs	Sat May  3 00:15:27 2008
@@ -177,6 +177,13 @@
 			}
 		}
 
+#if ENABLE_RDF_ADAPTER
+		public ICollection DoRDFQuery (Query query)
+		{
+			return null;
+		}
+#endif
+
 		public int DoCountMatchQuery (Query query)
 		{
 			// FIXME: Implement this

Modified: trunk/beagle/beagled/LocateQueryable/LocateDriver.cs
==============================================================================
--- trunk/beagle/beagled/LocateQueryable/LocateDriver.cs	(original)
+++ trunk/beagle/beagled/LocateQueryable/LocateDriver.cs	Sat May  3 00:15:27 2008
@@ -133,6 +133,13 @@
 			pc.Close ();
 		}
 
+#if ENABLE_RDF_ADAPTER
+		public ICollection DoRDFQuery (Query query)
+		{
+			return null;
+		}
+#endif
+
 		public int DoCountMatchQuery (Query query)
 		{
 			return 0;

Modified: trunk/beagle/beagled/Makefile.am
==============================================================================
--- trunk/beagle/beagled/Makefile.am	(original)
+++ trunk/beagle/beagled/Makefile.am	Sat May  3 00:15:27 2008
@@ -435,7 +435,7 @@
 GOOGLE_BACKEND_CSFILES = $(GOOGLE_BACKEND_LOCAL_CSFILES) $(XEMAIL_CSFILES)
 
 $(GOOGLE_BACKEND_TARGET): $(GOOGLE_BACKEND_CSFILES)  $(BACKEND_LOCAL_ASSEMBLIES)
-	$(CSC) -out:$@ $(GOOGLE_BACKEND_CSFILES) $(XEMAIL_CSFLAGS) $(XEMAIL_ASSEMBLIES) $(BACKEND_CSFLAGS) $(BACKEND_ASSEMBLIES) $(BEAGLED_LIBS)
+	$(CSC) -out:$@ $(GOOGLE_BACKEND_CSFILES) $(XEMAIL_CSFLAGS) $(BEAGLE_DEFINES) $(XEMAIL_ASSEMBLIES) $(BACKEND_CSFLAGS) $(BACKEND_ASSEMBLIES) $(BEAGLED_LIBS)
 
 ############################################################