[f-spot] Move Platform.



commit abcefbb3ff36fc9318306e77f9f8b3316fd8f088
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun Aug 8 15:35:09 2010 +0200

    Move Platform.

 .gitignore                                         |    1 +
 configure.ac                                       |    2 +-
 .../FSpot.Platform/FSpot.Platform}/Desktop.cs      |    0
 .../FSpot.Platform}/PreferenceBackend.cs           |    6 +-
 .../FSpot.Platform/FSpot.Platform}/ScreenSaver.cs  |    0
 .../FSpot.Platform/FSpot.Platform}/WebProxy.cs     |    0
 src/Core/FSpot.Platform/Makefile.am                |   13 ++++
 src/Core/Makefile.am                               |    3 +-
 src/Makefile.am                                    |    1 -
 src/Platform/Makefile.am                           |   20 ------
 src/Platform/Null/Desktop.cs                       |   20 ------
 src/Platform/Null/PreferenceBackend.cs             |   68 --------------------
 src/Platform/Null/ScreenSaver.cs                   |   27 --------
 src/Platform/Null/WebProxy.cs                      |   22 ------
 14 files changed, 20 insertions(+), 163 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b347127..054117c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,6 @@ help/*/*.page
 !help/C/*.page
 help/*/*.xml
 !help/C/*.xml
+/src/Core/FSpot.Widgets/FSpot.Widgets.dll.config
 /src/Clients/MainApp/f-spot
 /src/Clients/MainApp/f-spot.exe.config
diff --git a/configure.ac b/configure.ac
index 0bf4872..a5fd9a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,6 +363,7 @@ src/Core/FSpot.Utils/Makefile
 src/Core/FSpot.Query/Makefile
 src/Core/FSpot.Widgets/Makefile
 src/Core/FSpot.Widgets/FSpot.Widgets.dll.config
+src/Core/FSpot.Platform/Makefile
 
 src/Clients/Makefile
 src/Clients/MainApp/Makefile
@@ -372,7 +373,6 @@ docs/Makefile
 icons/Makefile
 tools/Makefile
 po/Makefile.in
-src/Platform/Makefile
 src/Makefile
 extensions/Makefile
 extensions/Editors/Makefile
diff --git a/src/Platform/Gnome/Desktop.cs b/src/Core/FSpot.Platform/FSpot.Platform/Desktop.cs
similarity index 100%
rename from src/Platform/Gnome/Desktop.cs
rename to src/Core/FSpot.Platform/FSpot.Platform/Desktop.cs
diff --git a/src/Platform/Gnome/PreferenceBackend.cs b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
similarity index 100%
rename from src/Platform/Gnome/PreferenceBackend.cs
rename to src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
index 9d0e02c..1140877 100644
--- a/src/Platform/Gnome/PreferenceBackend.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
@@ -32,7 +32,10 @@ namespace FSpot
 			this.val = val;
 		}
 	}
+}
 
+namespace FSpot.Platform
+{
 	[Serializable]
 	public class NoSuchKeyException : Exception
 	{
@@ -52,10 +55,7 @@ namespace FSpot
 		{
 		}
 	}
-}
 
-namespace FSpot.Platform
-{
 	public class PreferenceBackend
 	{
 		static object sync_handler = new object ();
diff --git a/src/Platform/Gnome/ScreenSaver.cs b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
similarity index 100%
rename from src/Platform/Gnome/ScreenSaver.cs
rename to src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
diff --git a/src/Platform/Gnome/WebProxy.cs b/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
similarity index 100%
rename from src/Platform/Gnome/WebProxy.cs
rename to src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
diff --git a/src/Core/FSpot.Platform/Makefile.am b/src/Core/FSpot.Platform/Makefile.am
new file mode 100644
index 0000000..334433c
--- /dev/null
+++ b/src/Core/FSpot.Platform/Makefile.am
@@ -0,0 +1,13 @@
+ASSEMBLY = FSpot.Platform
+TARGET = library
+LINK = $(REF_FSPOT_PLATFORM)
+
+SOURCES = \
+	FSpot.Platform/Desktop.cs \
+	FSpot.Platform/PreferenceBackend.cs \
+	FSpot.Platform/ScreenSaver.cs \
+	FSpot.Platform/WebProxy.cs
+
+RESOURCES =
+
+include $(top_srcdir)/build/build.mk
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index 43587a1..0627bc8 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -5,4 +5,5 @@ SUBDIRS = \
 		FSpot.Core \
 		FSpot.JobScheduler \
 		FSpot.Query \
-		FSpot.Widgets
+		FSpot.Widgets \
+		FSpot.Platform
diff --git a/src/Makefile.am b/src/Makefile.am
index e4f6c2d..d18a2ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
 SUBDIRS = \
 	Core \
-	Platform \
 	Clients
 
 EXTRA_DIST = AssemblyInfo.cs.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]