Author: abock
Date: 2007-08-21 14:15:13 -0400 (Tue, 21 Aug 2007)
New Revision: 84574
Modified:
trunk/Mono.Zeroconf/src/MZClient/mzclient.in
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi/Makefile.am
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/ZeroconfProvider.cs
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/IZeroconfProvider.cs
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
Log:
Hopefully last bit of the cleanup/reorg
Modified: trunk/Mono.Zeroconf/src/MZClient/mzclient.in
===================================================================
--- trunk/Mono.Zeroconf/src/MZClient/mzclient.in 2007-08-21 18:01:01 UTC
(rev 84573)
+++ trunk/Mono.Zeroconf/src/MZClient/mzclient.in 2007-08-21 18:15:13 UTC
(rev 84574)
@@ -1,3 +1,3 @@
#!/bin/bash
-mono @expanded_libdir@/mono-zeroconf/MZClient.exe "$@"
+mono --debug @expanded_libdir@/mono-zeroconf/MZClient.exe "$@"
Modified:
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/IZeroconfProvider.cs
===================================================================
---
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/IZeroconfProvider.cs
2007-08-21 18:01:01 UTC (rev 84573)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/IZeroconfProvider.cs
2007-08-21 18:15:13 UTC (rev 84574)
@@ -28,7 +28,7 @@
using System;
-namespace Mono.Zeroconf
+namespace Mono.Zeroconf.Providers
{
public interface IZeroconfProvider
{
Modified:
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
===================================================================
---
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
2007-08-21 18:01:01 UTC (rev 84573)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
2007-08-21 18:15:13 UTC (rev 84574)
@@ -75,7 +75,7 @@
}
foreach(string directory in directories) {
- foreach(string file in Directory.GetFiles(directory,
"Mono.Zeroconf.*.dll")) {
+ foreach(string file in Directory.GetFiles(directory, "*.dll"))
{
if(Path.GetFileName(file) !=
Path.GetFileName(this_asm_path)) {
Assembly provider_asm = Assembly.LoadFile(file);
foreach(Attribute attr in
provider_asm.GetCustomAttributes(false)) {
Modified: trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi/Makefile.am
2007-08-21 18:01:01 UTC (rev 84573)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi/Makefile.am
2007-08-21 18:15:13 UTC (rev 84574)
@@ -1,15 +1,15 @@
-ASSEMBLY_NAME = Mono.Zeroconf.Avahi
+ASSEMBLY_NAME = Mono.Zeroconf.Providers.Avahi
ASSEMBLY = $(ASSEMBLY_NAME).dll
-MONO_ZEROCONF_AVAHI_SRC = \
- Mono.Zeroconf.Avahi/ResolvableService.cs \
- Mono.Zeroconf.Avahi/ServiceBrowser.cs \
- Mono.Zeroconf.Avahi/Service.cs \
- Mono.Zeroconf.Avahi/TxtRecord.cs \
- Mono.Zeroconf.Avahi/ZeroconfProvider.cs
+MONO_ZEROCONF_PROVIDERS_AVAHI_SRC = \
+ Mono.Zeroconf.Providers.Avahi/ResolvableService.cs \
+ Mono.Zeroconf.Providers.Avahi/ServiceBrowser.cs \
+ Mono.Zeroconf.Providers.Avahi/Service.cs \
+ Mono.Zeroconf.Providers.Avahi/TxtRecord.cs \
+ Mono.Zeroconf.Providers.Avahi/ZeroconfProvider.cs
SOURCES_PRE = \
- $(MONO_ZEROCONF_AVAHI_SRC)
+ $(MONO_ZEROCONF_PROVIDERS_AVAHI_SRC)
SOURCES = $(foreach source,$(SOURCES_PRE),$(srcdir)/$(source))
@@ -21,12 +21,13 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(top_builddir)/src/Mono.Zeroconf/Mono.Zeroconf.dll $(SOURCES)
- $(MCS) -target:library -out:$@ -r:$< $(AVAHI_LIBS) $(SOURCES)
+ $(MCS) -debug -target:library -out:$@ -r:$< $(AVAHI_LIBS) $(SOURCES)
endif
EXTRA_DIST = $(SOURCES)
-CLEANFILES = $(ASSEMBLY)
+CLEANFILES = *.dll *.exe *.mdb
+DISTCLEANFILES = *.pidb
MAINTAINERCLEANFILES = \
Makefile.in
Modified:
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/ZeroconfProvider.cs
===================================================================
---
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/ZeroconfProvider.cs
2007-08-21 18:01:01 UTC (rev 84573)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour/ZeroconfProvider.cs
2007-08-21 18:15:13 UTC (rev 84574)
@@ -28,7 +28,7 @@
using System;
-using Mono.Zeroconf;
+[assembly:Mono.Zeroconf.Providers.ZeroconfProvider(typeof(Mono.Zeroconf.Providers.Bonjour.ZeroconfProvider))]
namespace Mono.Zeroconf.Providers.Bonjour
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
