GNOME.org
 

f-spot r4208 - in trunk/dpap-sharp: . dpap-client dpap-server lib

Author: apart
Date: Sat Jul 26 19:40:46 2008
New Revision: 4208
URL: http://svn.gnome.org/viewvc/f-spot?rev=4208&view=rev

Log:
Prepared the makefiles et al. in order to compile and run the test programs


Added:
   trunk/dpap-sharp/dpap-client/Makefile.am
   trunk/dpap-sharp/dpap-client/dpap-sharp.dll   (contents, props changed)
   trunk/dpap-sharp/dpap-server/Makefile.am
   trunk/dpap-sharp/dpap-server/dpap-sharp.dll   (contents, props changed)
   trunk/dpap-sharp/dpap-server/test1.jpg   (contents, props changed)
   trunk/dpap-sharp/dpap-server/test2.jpg   (contents, props changed)
Modified:
   trunk/dpap-sharp/ChangeLog
   trunk/dpap-sharp/Makefile.am
   trunk/dpap-sharp/dpap-client/dpap-client.mdp
   trunk/dpap-sharp/dpap-server/Main.cs
   trunk/dpap-sharp/dpap-server/dpap-server.mdp
   trunk/dpap-sharp/lib/Makefile.am

Modified: trunk/dpap-sharp/Makefile.am
==============================================================================
--- trunk/dpap-sharp/Makefile.am	(original)
+++ trunk/dpap-sharp/Makefile.am	Sat Jul 26 19:40:46 2008
@@ -1,2 +1,4 @@
 SUBDIRS = 			\
-	lib
+	lib		\
+	dpap-server	\
+	dpap-client

Added: trunk/dpap-sharp/dpap-client/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/dpap-sharp/dpap-client/Makefile.am	Sat Jul 26 19:40:46 2008
@@ -0,0 +1,32 @@
+include $(top_srcdir)/Makefile.include
+
+ASSEMBLY_NAME = dpap-client
+
+ASSEMBLY_SOURCES =  \
+	AssemblyInfo.cs \
+	Main.cs
+
+REFS =  \
+	-pkg:banshee-1-core \
+	-pkg:banshee-1-services \
+	-r:../lib/dpap-sharp.dll 
+
+ASSEMBLY = $(ASSEMBLY_NAME).exe
+
+all: $(ASSEMBLY)
+
+$(ASSEMBLY): $(ASSEMBLY_SOURCES)
+	$(CSC) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
+
+assemblydir = $(pkglibdir)
+assembly_DATA =			\
+	$(ASSEMBLY)
+
+EXTRA_DIST =				\
+	$(ASSEMBLY_SOURCES)
+
+CLEANFILES =			\
+	$(ASSEMBLY)		\
+	$(ASSEMBLY).mdb
+	
+

Modified: trunk/dpap-sharp/dpap-client/dpap-client.mdp
==============================================================================
--- trunk/dpap-sharp/dpap-client/dpap-client.mdp	(original)
+++ trunk/dpap-sharp/dpap-client/dpap-client.mdp	Sat Jul 26 19:40:46 2008
@@ -25,4 +25,13 @@
     <ProjectReference type="Gac" localcopy="True" refto="Banshee.Services, Version=1.0.0.38868, Culture=neutral" />
     <ProjectReference type="Project" localcopy="True" refto="dpap-sharp" />
   </References>
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" SyncReferences="True" IsAutotoolsProject="True" RelativeConfigureInPath="../..">
+    <BuildFilesVar Sync="True" Name="ASSEMBLY_SOURCES" />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar Sync="True" Name="REFS" Prefix="-r:" />
+    <AsmRefVar Sync="True" Name="REFS" Prefix="-r:" />
+    <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
+  </MonoDevelop.Autotools.MakefileInfo>
 </Project>
\ No newline at end of file

Added: trunk/dpap-sharp/dpap-client/dpap-sharp.dll
==============================================================================
--- (empty file)
+++ trunk/dpap-sharp/dpap-client/dpap-sharp.dll	Sat Jul 26 19:40:46 2008
@@ -0,0 +1 @@
+link ../lib/dpap-sharp.dll
\ No newline at end of file

Modified: trunk/dpap-sharp/dpap-server/Main.cs
==============================================================================
--- trunk/dpap-sharp/dpap-server/Main.cs	(original)
+++ trunk/dpap-sharp/dpap-server/Main.cs	Sat Jul 26 19:40:46 2008
@@ -49,24 +49,24 @@
 			
 			Console.WriteLine("Starting DPAP server");
 			DPAP.Database database = new DPAP.Database("DPAP");
-			DPAP.Server server = new Server("apart photos");
+			DPAP.Server server = new Server("f-spot photos");
 			server.Port = 8770;
 			server.AuthenticationMethod = AuthenticationMethod.None;
 			int collision_count = 0;
 			server.Collision += delegate {
-				server.Name = "apart photos" + " [" + ++collision_count + "]";
+				server.Name = "f-spot photos" + " [" + ++collision_count + "]";
 			};
             
 			Photo p = new Photo();
-			p.FileName = "./podeszczu.jpg";
-			p.Title = "test";
+			p.FileName = "./test1.jpg";
+			p.Title = "test1";
 			p.Format = "JPEG";
 			p.Size = 13946;
 			database.AddPhoto(p);
 			
 			Photo p1 = new Photo();
-			p1.FileName = "./Grill.jpg";
-			p1.Title = "grill";
+			p1.FileName = "./test2.jpg";
+			p1.Title = "test2";
 			p1.Format = "JPEG";
 			p1.Size = 35209;
 			database.AddPhoto(p1);

Added: trunk/dpap-sharp/dpap-server/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/dpap-sharp/dpap-server/Makefile.am	Sat Jul 26 19:40:46 2008
@@ -0,0 +1,36 @@
+include $(top_srcdir)/Makefile.include
+
+ASSEMBLY_NAME = dpap-server
+
+ASSEMBLY_SOURCES =  \
+	AssemblyInfo.cs \
+	Main.cs
+
+REFS =					\
+	-r:ICSharpCode.SharpZipLib \
+	-r:../lib/dpap-sharp.dll
+
+PKGS =  \
+	-pkg:banshee-1-core \
+	-pkg:banshee-1-services 
+#	System
+
+ASSEMBLY = $(ASSEMBLY_NAME).exe
+
+all: $(ASSEMBLY)
+
+$(ASSEMBLY): $(ASSEMBLY_SOURCES)
+	$(CSC) -out:$@ $(PKGS) $(REFS) $(ASSEMBLY_SOURCES)
+
+assemblydir = $(pkglibdir)
+assembly_DATA =			\
+	$(ASSEMBLY)
+
+EXTRA_DIST =				\
+	$(ASSEMBLY_SOURCES)
+
+CLEANFILES =			\
+	$(ASSEMBLY)		\
+	$(ASSEMBLY).mdb
+	
+

Modified: trunk/dpap-sharp/dpap-server/dpap-server.mdp
==============================================================================
--- trunk/dpap-sharp/dpap-server/dpap-server.mdp	(original)
+++ trunk/dpap-sharp/dpap-server/dpap-server.mdp	Sat Jul 26 19:40:46 2008
@@ -4,13 +4,13 @@
       <Output directory="bin/Debug" assembly="dpap-server" />
       <Build debugmode="True" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
       <Output directory="bin/Release" assembly="dpap-server" />
       <Build debugmode="False" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
-      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+      <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
     </Configuration>
   </Configurations>
   <Contents>
@@ -18,11 +18,17 @@
     <File name="AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
-    <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
-    <ProjectReference type="Gac" localcopy="True" refto="Banshee.Base, Version=0.13.2.20643, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Banshee.Core, Version=1.0.0.38867, Culture=neutral" />
     <ProjectReference type="Gac" localcopy="True" refto="Banshee.Services, Version=1.0.0.38868, Culture=neutral" />
     <ProjectReference type="Project" localcopy="True" refto="dpap-sharp" />
   </References>
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am" ExecuteTargetName="run" IsAutotoolsProject="True" RelativeConfigureInPath="../..">
+    <BuildFilesVar Name="ASSEMBLY_SOURCES" />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar Name="PKGS" />
+    <AsmRefVar Name="PKGS" />
+    <ProjectRefVar Name="PKGS" />
+  </MonoDevelop.Autotools.MakefileInfo>
 </Project>
\ No newline at end of file

Added: trunk/dpap-sharp/dpap-server/dpap-sharp.dll
==============================================================================
--- (empty file)
+++ trunk/dpap-sharp/dpap-server/dpap-sharp.dll	Sat Jul 26 19:40:46 2008
@@ -0,0 +1 @@
+link ../lib/dpap-sharp.dll
\ No newline at end of file

Added: trunk/dpap-sharp/dpap-server/test1.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/dpap-sharp/dpap-server/test2.jpg
==============================================================================
Binary file. No diff available.

Modified: trunk/dpap-sharp/lib/Makefile.am
==============================================================================
--- trunk/dpap-sharp/lib/Makefile.am	(original)
+++ trunk/dpap-sharp/lib/Makefile.am	Sat Jul 26 19:40:46 2008
@@ -17,11 +17,8 @@
 	$(srcdir)/Hasher.cs			\
 	$(srcdir)/LoginException.cs		\
 	$(srcdir)/Photo.cs			\
-	$(srcdir)/Playlist.cs			\
 	$(srcdir)/Server.cs			\
 	$(srcdir)/ServerInfo.cs			\
-	$(srcdir)/Source.cs			\
-	$(srcdir)/Track.cs			\
 	$(srcdir)/User.cs			\
 	$(srcdir)/Utility.cs
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]