GNOME.org
 

[f-spot] Move Query and Utils.

commit 768a63687c25f3557667a50a96fb7603b1c8a502
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun Aug 8 14:33:41 2010 +0200

    Move Query and Utils.

 .gitignore                                         |    2 +-
 configure.ac                                       |    4 +-
 .../FSpot.Query/FSpot.Query}/ConditionWrapper.cs   |    0
 .../FSpot.Query/FSpot.Query}/DateRange.cs          |    0
 .../FSpot.Query/FSpot.Query}/FolderSet.cs          |    0
 .../FSpot.Query/FSpot.Query}/IOrderCondition.cs    |    0
 .../FSpot.Query/FSpot.Query}/IQueryCondition.cs    |    0
 .../FSpot.Query/FSpot.Query}/LogicalTerm.cs        |    0
 .../FSpot.Query/FSpot.Query}/OrderByTime.cs        |    0
 .../FSpot.Query/FSpot.Query}/RatingRange.cs        |    0
 .../FSpot.Query/FSpot.Query}/RollSet.cs            |    0
 .../FSpot.Query}/Tests/LogicalTermTests.cs         |    0
 .../FSpot.Query/FSpot.Query}/UntaggedCondition.cs  |    0
 src/Core/FSpot.Query/Makefile.am                   |   20 +++++++++++
 .../FSpot.Utils}/FSpot.Utils.dll.config            |    0
 .../FSpot.Utils/FSpot.Utils}/Cache.cs              |    0
 .../FSpot.Utils/FSpot.Utils}/CairoUtils.cs         |    0
 .../FSpot.Utils/FSpot.Utils}/ConsoleCrayon.cs      |    0
 .../FSpot.Utils/FSpot.Utils}/FileExtensions.cs     |    0
 .../FSpot.Utils}/GIOTagLibFileAbstraction.cs       |    0
 .../FSpot.Utils/FSpot.Utils}/GdkUtils.cs           |    0
 .../FSpot.Utils/FSpot.Utils}/GtkUtil.cs            |    0
 .../FSpot.Utils/FSpot.Utils}/HashUtils.cs          |    0
 .../FSpot.Utils/FSpot.Utils}/Metadata.cs           |    0
 .../FSpot.Utils/FSpot.Utils}/PixbufUtils.cs        |    0
 .../FSpot.Utils}/RecursiveFileEnumerator.cs        |    0
 .../FSpot.Utils/FSpot.Utils}/SafeUriExtensions.cs  |    0
 .../FSpot.Utils}/SidecarXmpExtensions.cs           |    0
 .../Tests/GIOTagLibFileAbstractionTests.cs         |    0
 .../FSpot.Utils}/Tests/ImageTestHelper.cs          |    0
 .../FSpot.Utils/FSpot.Utils}/Tests/MetadataTest.cs |    0
 .../FSpot.Utils/FSpot.Utils}/Tests/SafeUriTests.cs |    0
 .../Tests/SidecarXmpExtensionsTests.cs             |    0
 .../FSpot.Utils}/Tests/XdgThumbnailSpecTests.cs    |    0
 .../FSpot.Utils/FSpot.Utils}/Unix.cs               |    0
 .../FSpot.Utils/FSpot.Utils}/UriExtensions.cs      |    0
 .../FSpot.Utils/FSpot.Utils}/UriUtils.cs           |    0
 .../FSpot.Utils/FSpot.Utils}/XdgThumbnailSpec.cs   |    0
 src/Core/FSpot.Utils/Makefile.am                   |   35 ++++++++++++++++++++
 src/Core/Makefile.am                               |    4 ++-
 src/Makefile.am                                    |    2 -
 src/Query/Makefile.am                              |   20 -----------
 src/Utils/Makefile.am                              |   35 --------------------
 43 files changed, 61 insertions(+), 61 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 09c50a4..b347127 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.exe
-*.config
 *~
 *#*#
 Makefile
@@ -52,3 +51,4 @@ help/*/*.page
 help/*/*.xml
 !help/C/*.xml
 /src/Clients/MainApp/f-spot
+/src/Clients/MainApp/f-spot.exe.config
diff --git a/configure.ac b/configure.ac
index e0166a9..eba4648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -359,6 +359,8 @@ src/Core/FSpot.Core/Makefile
 src/Core/FSpot.Core/FSpot.Core.dll.config
 src/Core/FSpot.Core/FSpot.Core/Defines.cs
 src/Core/FSpot.JobScheduler/Makefile
+src/Core/FSpot.Utils/Makefile
+src/Core/FSpot.Query/Makefile
 
 src/Clients/Makefile
 src/Clients/MainApp/Makefile
@@ -368,8 +370,6 @@ docs/Makefile
 icons/Makefile
 tools/Makefile
 po/Makefile.in
-src/Utils/Makefile
-src/Query/Makefile
 src/Widgets/Makefile
 src/Widgets/FSpot.Widgets.dll.config
 src/Platform/Makefile
diff --git a/src/Query/ConditionWrapper.cs b/src/Core/FSpot.Query/FSpot.Query/ConditionWrapper.cs
similarity index 100%
rename from src/Query/ConditionWrapper.cs
rename to src/Core/FSpot.Query/FSpot.Query/ConditionWrapper.cs
diff --git a/src/Query/DateRange.cs b/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
similarity index 100%
rename from src/Query/DateRange.cs
rename to src/Core/FSpot.Query/FSpot.Query/DateRange.cs
diff --git a/src/Query/FolderSet.cs b/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
similarity index 100%
rename from src/Query/FolderSet.cs
rename to src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
diff --git a/src/Query/IOrderCondition.cs b/src/Core/FSpot.Query/FSpot.Query/IOrderCondition.cs
similarity index 100%
rename from src/Query/IOrderCondition.cs
rename to src/Core/FSpot.Query/FSpot.Query/IOrderCondition.cs
diff --git a/src/Query/IQueryCondition.cs b/src/Core/FSpot.Query/FSpot.Query/IQueryCondition.cs
similarity index 100%
rename from src/Query/IQueryCondition.cs
rename to src/Core/FSpot.Query/FSpot.Query/IQueryCondition.cs
diff --git a/src/Query/LogicalTerm.cs b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
similarity index 100%
rename from src/Query/LogicalTerm.cs
rename to src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
diff --git a/src/Query/OrderByTime.cs b/src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs
similarity index 100%
rename from src/Query/OrderByTime.cs
rename to src/Core/FSpot.Query/FSpot.Query/OrderByTime.cs
diff --git a/src/Query/RatingRange.cs b/src/Core/FSpot.Query/FSpot.Query/RatingRange.cs
similarity index 100%
rename from src/Query/RatingRange.cs
rename to src/Core/FSpot.Query/FSpot.Query/RatingRange.cs
diff --git a/src/Query/RollSet.cs b/src/Core/FSpot.Query/FSpot.Query/RollSet.cs
similarity index 100%
rename from src/Query/RollSet.cs
rename to src/Core/FSpot.Query/FSpot.Query/RollSet.cs
diff --git a/src/Query/Tests/LogicalTermTests.cs b/src/Core/FSpot.Query/FSpot.Query/Tests/LogicalTermTests.cs
similarity index 100%
rename from src/Query/Tests/LogicalTermTests.cs
rename to src/Core/FSpot.Query/FSpot.Query/Tests/LogicalTermTests.cs
diff --git a/src/Query/UntaggedCondition.cs b/src/Core/FSpot.Query/FSpot.Query/UntaggedCondition.cs
similarity index 100%
rename from src/Query/UntaggedCondition.cs
rename to src/Core/FSpot.Query/FSpot.Query/UntaggedCondition.cs
diff --git a/src/Core/FSpot.Query/Makefile.am b/src/Core/FSpot.Query/Makefile.am
new file mode 100644
index 0000000..c83a40d
--- /dev/null
+++ b/src/Core/FSpot.Query/Makefile.am
@@ -0,0 +1,20 @@
+ASSEMBLY = FSpot.Query
+TARGET = library
+LINK = $(REF_FSPOT_QUERY)
+
+SOURCES = \
+	FSpot.Query/ConditionWrapper.cs \
+	FSpot.Query/DateRange.cs \
+	FSpot.Query/FolderSet.cs \
+	FSpot.Query/IOrderCondition.cs \
+	FSpot.Query/IQueryCondition.cs \
+	FSpot.Query/LogicalTerm.cs \
+	FSpot.Query/OrderByTime.cs \
+	FSpot.Query/RatingRange.cs \
+	FSpot.Query/RollSet.cs \
+	FSpot.Query/UntaggedCondition.cs \
+	FSpot.Query/Tests/LogicalTermTests.cs
+
+RESOURCES =
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/Utils/FSpot.Utils.dll.config b/src/Core/FSpot.Utils/FSpot.Utils.dll.config
similarity index 100%
rename from src/Utils/FSpot.Utils.dll.config
rename to src/Core/FSpot.Utils/FSpot.Utils.dll.config
diff --git a/src/Utils/Cache.cs b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
similarity index 100%
rename from src/Utils/Cache.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
diff --git a/src/Utils/CairoUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
similarity index 100%
rename from src/Utils/CairoUtils.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
diff --git a/src/Utils/ConsoleCrayon.cs b/src/Core/FSpot.Utils/FSpot.Utils/ConsoleCrayon.cs
similarity index 100%
rename from src/Utils/ConsoleCrayon.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/ConsoleCrayon.cs
diff --git a/src/Utils/FileExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
similarity index 100%
rename from src/Utils/FileExtensions.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
diff --git a/src/Utils/GIOTagLibFileAbstraction.cs b/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
similarity index 100%
rename from src/Utils/GIOTagLibFileAbstraction.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
diff --git a/src/Utils/GdkUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
similarity index 100%
rename from src/Utils/GdkUtils.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
diff --git a/src/Utils/GtkUtil.cs b/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
similarity index 100%
rename from src/Utils/GtkUtil.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
diff --git a/src/Utils/HashUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs
similarity index 100%
rename from src/Utils/HashUtils.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/HashUtils.cs
diff --git a/src/Utils/Metadata.cs b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
similarity index 100%
rename from src/Utils/Metadata.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
diff --git a/src/Utils/PixbufUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
similarity index 100%
rename from src/Utils/PixbufUtils.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
diff --git a/src/Utils/RecursiveFileEnumerator.cs b/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
similarity index 100%
rename from src/Utils/RecursiveFileEnumerator.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
diff --git a/src/Utils/SafeUriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
similarity index 100%
rename from src/Utils/SafeUriExtensions.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
diff --git a/src/Utils/SidecarXmpExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
similarity index 100%
rename from src/Utils/SidecarXmpExtensions.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
diff --git a/src/Utils/Tests/GIOTagLibFileAbstractionTests.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/GIOTagLibFileAbstractionTests.cs
similarity index 100%
rename from src/Utils/Tests/GIOTagLibFileAbstractionTests.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/GIOTagLibFileAbstractionTests.cs
diff --git a/src/Utils/Tests/ImageTestHelper.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/ImageTestHelper.cs
similarity index 100%
rename from src/Utils/Tests/ImageTestHelper.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/ImageTestHelper.cs
diff --git a/src/Utils/Tests/MetadataTest.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/MetadataTest.cs
similarity index 100%
rename from src/Utils/Tests/MetadataTest.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/MetadataTest.cs
diff --git a/src/Utils/Tests/SafeUriTests.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/SafeUriTests.cs
similarity index 100%
rename from src/Utils/Tests/SafeUriTests.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/SafeUriTests.cs
diff --git a/src/Utils/Tests/SidecarXmpExtensionsTests.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/SidecarXmpExtensionsTests.cs
similarity index 100%
rename from src/Utils/Tests/SidecarXmpExtensionsTests.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/SidecarXmpExtensionsTests.cs
diff --git a/src/Utils/Tests/XdgThumbnailSpecTests.cs b/src/Core/FSpot.Utils/FSpot.Utils/Tests/XdgThumbnailSpecTests.cs
similarity index 100%
rename from src/Utils/Tests/XdgThumbnailSpecTests.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Tests/XdgThumbnailSpecTests.cs
diff --git a/src/Utils/Unix.cs b/src/Core/FSpot.Utils/FSpot.Utils/Unix.cs
similarity index 100%
rename from src/Utils/Unix.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/Unix.cs
diff --git a/src/Utils/UriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs
similarity index 100%
rename from src/Utils/UriExtensions.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/UriExtensions.cs
diff --git a/src/Utils/UriUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
similarity index 100%
rename from src/Utils/UriUtils.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
diff --git a/src/Utils/XdgThumbnailSpec.cs b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
similarity index 100%
rename from src/Utils/XdgThumbnailSpec.cs
rename to src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
diff --git a/src/Core/FSpot.Utils/Makefile.am b/src/Core/FSpot.Utils/Makefile.am
new file mode 100644
index 0000000..fe0f701
--- /dev/null
+++ b/src/Core/FSpot.Utils/Makefile.am
@@ -0,0 +1,35 @@
+ASSEMBLY = FSpot.Utils
+TARGET = library
+LINK = $(REF_FSPOT_UTILS)
+
+SOURCES = \
+	FSpot.Utils/Cache.cs \
+	FSpot.Utils/CairoUtils.cs \
+	FSpot.Utils/ConsoleCrayon.cs \
+	FSpot.Utils/FileExtensions.cs \
+	FSpot.Utils/GdkUtils.cs \
+	FSpot.Utils/GIOTagLibFileAbstraction.cs \
+	FSpot.Utils/GtkUtil.cs \
+	FSpot.Utils/HashUtils.cs \
+	FSpot.Utils/Metadata.cs \
+	FSpot.Utils/PixbufUtils.cs \
+	FSpot.Utils/RecursiveFileEnumerator.cs \
+	FSpot.Utils/SafeUriExtensions.cs \
+	FSpot.Utils/SidecarXmpExtensions.cs \
+	FSpot.Utils/Unix.cs \
+	FSpot.Utils/UriExtensions.cs \
+	FSpot.Utils/UriUtils.cs \
+	FSpot.Utils/XdgThumbnailSpec.cs \
+	FSpot.Utils/Tests/GIOTagLibFileAbstractionTests.cs \
+	FSpot.Utils/Tests/ImageTestHelper.cs \
+	FSpot.Utils/Tests/MetadataTest.cs \
+	FSpot.Utils/Tests/SafeUriTests.cs \
+	FSpot.Utils/Tests/SidecarXmpExtensionsTests.cs \
+	FSpot.Utils/Tests/XdgThumbnailSpecTests.cs
+
+RESOURCES =
+
+include $(top_srcdir)/build/build.mk
+
+EXTRA_DIST += FSpot.Utils.dll.config
+module_SCRIPTS += FSpot.Utils.dll.config
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index 2d817ea..cbd2807 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -2,4 +2,6 @@ SUBDIRS = \
 		FSpot.Bling \
 		FSpot.Cms \
 		FSpot.Core \
-		FSpot.JobScheduler
+		FSpot.JobScheduler \
+		FSpot.Utils \
+		FSpot.Query
diff --git a/src/Makefile.am b/src/Makefile.am
index d4aa7f8..7922456 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,5 @@
 SUBDIRS = \
-	Utils \
 	Core \
-	Query \
 	Platform \
 	Widgets \
 	Clients
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]