GNOME.org
 

f-spot r3615 - in trunk: . src src/Core

Author: sdelcroix
Date: Wed Jan 30 12:57:29 2008
New Revision: 3615
URL: http://svn.gnome.org/viewvc/f-spot?rev=3615&view=rev

Log:
splitting RollStore, new Query.dll assembly

Added:
   trunk/src/Core/Roll.cs
Modified:
   trunk/f-spot.pc.in
   trunk/src/Makefile.am
   trunk/src/RollStore.cs

Modified: trunk/f-spot.pc.in
==============================================================================
--- trunk/f-spot.pc.in	(original)
+++ trunk/f-spot.pc.in	Wed Jan 30 12:57:29 2008
@@ -6,4 +6,4 @@
 Name: F-Spot
 Description: F-Spot, Organise, enjoy and share your pictures
 Version: @VERSION@
-Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll
+Libs: -r:${libdir}/f-spot/f-spot.exe -r:${libdir}/f-spot/FSpot.Core.dll -r:${libdir}/f-spot/FSpot.Utils.dll -r:${libdir}/f-spot/Cms.dll -r:${libdir}/f-spot/Query.dll

Added: trunk/src/Core/Roll.cs
==============================================================================
--- (empty file)
+++ trunk/src/Core/Roll.cs	Wed Jan 30 12:57:29 2008
@@ -0,0 +1,29 @@
+/*
+ * RollStore.cs
+ *
+ * Author(s)
+ *	Bengt Thuree
+ *	Stephane Delcroix <stephane delcroix org>
+ *
+ * This is free software. See COPYING for details.
+ */
+
+using System;
+using FSpot.Utils;
+
+namespace FSpot
+{
+	public class Roll : DbItem
+	{
+		// The time is always in UTC.
+		private DateTime time;
+		public DateTime Time {
+			get { return time; }
+		}
+	
+		public Roll (uint id, long unix_time) : base (id)
+		{
+			time = DbUtils.DateTimeFromUnixTime (unix_time);
+		}
+	}
+}

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jan 30 12:57:29 2008
@@ -1,13 +1,6 @@
 include $(top_srcdir)/Makefile.include
 EXTRAFLAGS = -unsafe -nowarn:0169 -nowarn:0612 -nowarn:0414 -d:TEST_METADATA -d:BROKEN_RSVG $(NUNIT_DEFINES) $(BEAGLE_DEFINES) $(CSC_DEFINES)
 
-UTILS_CSDISTFILES =					\
-	$(srcdir)/Utils/DbUtils.cs			\
-	$(srcdir)/Utils/GnomeUtil.cs			\
-	$(srcdir)/Utils/GtkUtil.cs			\
-	$(srcdir)/Utils/UriUtils.cs			\
-	$(srcdir)/Utils/ScreenSaver.cs
-
 CMS_CSDISTFILES =				\
 	$(srcdir)/Cms/Cms.cs			\
 	$(srcdir)/Cms/CctTable.cs
@@ -20,7 +13,23 @@
 	$(srcdir)/Core/Global.cs		\
 	$(srcdir)/Core/IBrowsableItem.cs	\
 	$(srcdir)/Core/IBrowsableCollection.cs	\
-	$(srcdir)/Core/IPreferenceBackend.cs
+	$(srcdir)/Core/IPreferenceBackend.cs	\
+	$(srcdir)/Core/Roll.cs
+
+QUERY_CSDISTFILES =				\
+	$(srcdir)/Query/DateRange.cs		\
+	$(srcdir)/Query/IQueryCondition.cs	\
+	$(srcdir)/Query/LogicalTerm.cs		\
+	$(srcdir)/Query/RatingRange.cs		\
+	$(srcdir)/Query/RollSet.cs		\
+	$(srcdir)/Query/UntaggedCondition.cs
+
+UTILS_CSDISTFILES =				\
+	$(srcdir)/Utils/DbUtils.cs		\
+	$(srcdir)/Utils/GnomeUtil.cs		\
+	$(srcdir)/Utils/GtkUtil.cs		\
+	$(srcdir)/Utils/UriUtils.cs		\
+	$(srcdir)/Utils/ScreenSaver.cs
 
 F_SPOT_CSDISTFILES =				\
 	$(srcdir)/Cairo/Antialias.cs		\
@@ -193,12 +202,6 @@
 	$(srcdir)/PreviewPopup.cs 		\
 	$(srcdir)/PrintDialog.cs		\
 	$(srcdir)/ProgressDialog.cs		\
-	$(srcdir)/Query/DateRange.cs		\
-	$(srcdir)/Query/IQueryCondition.cs	\
-	$(srcdir)/Query/LogicalTerm.cs		\
-	$(srcdir)/Query/RatingRange.cs		\
-	$(srcdir)/Query/RollSet.cs		\
-	$(srcdir)/Query/UntaggedCondition.cs	\
 	$(srcdir)/RatingFilter.cs		\
 	$(srcdir)/QueuedSqliteDatabase.cs	\
 	$(srcdir)/RepairDialog.cs		\
@@ -272,13 +275,6 @@
 GCONF_PKG = -pkg:gconf-sharp-2.0
 endif
 
-UTILS_ASSEMBLIES =				\
-	-pkg:gtk-sharp-2.0			\
-	-pkg:gnome-sharp-2.0			\
-	-r:Mono.Posix				\
-	$(GCONF_PKG)				\
-	$(LINK_DBUS)
-
 CMS_ASSEMBLIES = 				\
 	$(NUNIT_PKG)				\
 	-pkg:gtk-sharp-2.0
@@ -290,6 +286,17 @@
 	-r:Mono.Posix				\
 	-r:FSpot.Utils.dll
 
+QUERY_ASSEMBLIES =				\
+	-r:FSpot.Core.dll			\
+	-r:FSpot.Utils.dll
+
+UTILS_ASSEMBLIES =				\
+	-pkg:gtk-sharp-2.0			\
+	-pkg:gnome-sharp-2.0			\
+	-r:Mono.Posix				\
+	$(GCONF_PKG)				\
+	$(LINK_DBUS)
+
 F_SPOT_ASSEMBLIES = 				\
 	$(LINK_DBUS)				\
 	$(LINK_GPHOTO2)				\
@@ -308,8 +315,9 @@
 	-r:Mono.Posix				\
 	-r:Mono.Security			\
 	-r:ICSharpCode.SharpZipLib		\
-	-r:FSpot.Utils.dll			\
 	-r:FSpot.Core.dll			\
+	-r:FSpot.Query.dll			\
+	-r:FSpot.Utils.dll			\
 	-r:Cms.dll				\
 	$(NUNIT_PKG)				\
 	$(GCONF_PKG)				\
@@ -333,17 +341,20 @@
 		Cms.dll.config		\
 		Cms.dll			\
 		FSpot.Utils.dll		\
+		FSpot.Query.dll		\
 		FSpot.Core.dll
 
 bin_SCRIPTS = f-spot
 
-UTILS_CSFILES = $(UTILS_CSDISTFILES)
-
 CMS_CSFILES = $(CMS_CSDISTFILES)
 
 CORE_CSFILES = $(CORE_CSDISTFILES)	\
 	Core/Defines.cs	
 
+QUERY_CSFILES = $(QUERY_CSDISTFILES)
+
+UTILS_CSFILES = $(UTILS_CSDISTFILES)
+
 F_SPOT_CSFILES = $(F_SPOT_CSDISTFILES)	\
 	AssemblyInfo.cs
 
@@ -351,15 +362,19 @@
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(CMS_CSFILES) $(CMS_ASSEMBLIES)
 
-FSpot.Utils.dll: $(UTILS_CSFILES)
-	@echo -e "\n*** Compiling $@"
-	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UTILS_CSFILES) $(UTILS_ASSEMBLIES)
-
 FSpot.Core.dll: $(CORE_CSFILES) FSpot.Utils.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(CORE_CSFILES) $(CORE_ASSEMBLIES)
 
-f-spot.exe: $(F_SPOT_CSFILES) f-spot.glade dces.rdf FSpot.addin.xml FSpot.Utils.dll FSpot.Core.dll Cms.dll
+FSpot.Query.dll: $(QUERY_CSFILES) FSpot.Utils.dll FSpot.Core.dll
+	@echo -e "\n*** Compiling $@"
+	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(QUERY_CSFILES) $(QUERY_ASSEMBLIES)
+
+FSpot.Utils.dll: $(UTILS_CSFILES)
+	@echo -e "\n*** Compiling $@"
+	$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(UTILS_CSFILES) $(UTILS_ASSEMBLIES)
+
+f-spot.exe: $(F_SPOT_CSFILES) f-spot.glade dces.rdf FSpot.addin.xml FSpot.Utils.dll FSpot.Core.dll FSpot.Query.dll Cms.dll
 	@echo -e "\n*** Compiling $@"
 	$(CSC) -target:winexe -out:$@ $(EXTRAFLAGS) $(F_SPOT_CSFILES) $(F_SPOT_ASSEMBLIES) $(RESOURCES)
 
@@ -387,6 +402,8 @@
 	Cms.dll					\
 	FSpot.Utils.dll.mdb			\
 	FSpot.Utils.dll				\
+	FSpot.Query.dll				\
+	FSpot.Query.dll.mdb			\
 	FSpot.Core.dll.mdb			\
 	FSpot.Core.dll
 

Modified: trunk/src/RollStore.cs
==============================================================================
--- trunk/src/RollStore.cs	(original)
+++ trunk/src/RollStore.cs	Wed Jan 30 12:57:29 2008
@@ -15,19 +15,7 @@
 using System;
 using Banshee.Database;
 using FSpot.Utils;
-public class Roll : DbItem
-{
-	// The time is always in UTC.
-	private DateTime time;
-	public DateTime Time {
-		get { return time; }
-	}
-
-	public Roll (uint id, long unix_time) : base (id)
-	{
-		time = DbUtils.DateTimeFromUnixTime (unix_time);
-	}
-}
+using FSpot;
 
 public class RollStore : DbStore
 {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]