Author: abock
Date: 2007-08-21 13:38:56 -0400 (Tue, 21 Aug 2007)
New Revision: 84571
Added:
trunk/Mono.Zeroconf/Mono.Zeroconf.mds
trunk/Mono.Zeroconf/src/MZClient/MZClient.mdp
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour.mdp
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.mdp
Removed:
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ZeroconfProvider.cs
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.dll.config
Modified:
trunk/Mono.Zeroconf/
trunk/Mono.Zeroconf/configure.ac
trunk/Mono.Zeroconf/src/MZClient/
trunk/Mono.Zeroconf/src/Makefile.am
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi/
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/
trunk/Mono.Zeroconf/src/Mono.Zeroconf/
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
Log:
More cleanup, yay
Property changes on: trunk/Mono.Zeroconf
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.*
autom4te.cache
INSTALL
missing
Makefile
aclocal.m4
install-sh
+ configure
Makefile.in
config.*
autom4te.cache
INSTALL
missing
Makefile
aclocal.m4
install-sh
*.userprefs
Added: trunk/Mono.Zeroconf/Mono.Zeroconf.mds
===================================================================
--- trunk/Mono.Zeroconf/Mono.Zeroconf.mds 2007-08-21 17:35:59 UTC (rev
84570)
+++ trunk/Mono.Zeroconf/Mono.Zeroconf.mds 2007-08-21 17:38:56 UTC (rev
84571)
@@ -0,0 +1,21 @@
+<Combine name="Mono.Zeroconf" fileversion="2.0">
+ <Configurations active="Debug">
+ <Configuration name="Debug" ctype="CombineConfiguration">
+ <Entry build="True" name="Mono.Zeroconf" configuration="Debug" />
+ <Entry build="True" name="Mono.Zeroconf" configuration="Debug" />
+ <Entry build="True" name="Mono.Zeroconf.Providers.Bonjour"
configuration="Debug" />
+ <Entry build="True" name="MZClient" configuration="Debug" />
+ </Configuration>
+ </Configurations>
+ <DeployTargets />
+ <StartMode startupentry="MZClient" single="True">
+ <Execute type="None" entry="Mono.Zeroconf" />
+ <Execute type="None" entry="Mono.Zeroconf.Providers.Bonjour" />
+ <Execute type="None" entry="MZClient" />
+ </StartMode>
+ <Entries>
+ <Entry filename="./src/Mono.Zeroconf/Mono.Zeroconf.mdp" />
+ <Entry
filename="./src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour.mdp"
/>
+ <Entry filename="./src/MZClient/MZClient.mdp" />
+ </Entries>
+</Combine>
\ No newline at end of file
Modified: trunk/Mono.Zeroconf/configure.ac
===================================================================
--- trunk/Mono.Zeroconf/configure.ac 2007-08-21 17:35:59 UTC (rev 84570)
+++ trunk/Mono.Zeroconf/configure.ac 2007-08-21 17:38:56 UTC (rev 84571)
@@ -41,7 +41,8 @@
src/Makefile
src/mono-zeroconf.pc
src/Mono.Zeroconf/Makefile
-src/Mono.Zeroconf.Avahi/Makefile
+src/Mono.Zeroconf.Providers.Bonjour/Makefile
+src/Mono.Zeroconf.Providers.Avahi/Makefile
src/MZClient/Makefile
src/MZClient/mzclient
docs/Makefile
Property changes on: trunk/Mono.Zeroconf/src/MZClient
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
*.exe
mzclient
+ Makefile
Makefile.in
*.exe
*.dll
*.mdb
*.pidb
mzclient
Added: trunk/Mono.Zeroconf/src/MZClient/MZClient.mdp
===================================================================
--- trunk/Mono.Zeroconf/src/MZClient/MZClient.mdp 2007-08-21 17:35:59 UTC
(rev 84570)
+++ trunk/Mono.Zeroconf/src/MZClient/MZClient.mdp 2007-08-21 17:38:56 UTC
(rev 84571)
@@ -0,0 +1,18 @@
+<Project name="MZClient" fileversion="2.0" language="C#" clr-version="Net_1_1"
ctype="DotNetProject">
+ <Configurations active="Debug">
+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+ <Output directory="./" assembly="MZClient" />
+ <Build debugmode="True" target="Exe" />
+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+ <CodeGeneration compiler="Csc" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" mainclass=""
generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+ </Configuration>
+ </Configurations>
+ <DeployTargets />
+ <Contents>
+ <File name="./ZeroconfClient.cs" subtype="Code" buildaction="Compile" />
+ </Contents>
+ <References>
+ <ProjectReference type="Project" localcopy="True" refto="Mono.Zeroconf" />
+ <ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ </References>
+</Project>
\ No newline at end of file
Modified: trunk/Mono.Zeroconf/src/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Makefile.am 2007-08-21 17:35:59 UTC (rev 84570)
+++ trunk/Mono.Zeroconf/src/Makefile.am 2007-08-21 17:38:56 UTC (rev 84571)
@@ -1,6 +1,7 @@
SUBDIRS = \
Mono.Zeroconf \
- Mono.Zeroconf.Avahi \
+ Mono.Zeroconf.Providers.Bonjour \
+ Mono.Zeroconf.Providers.Avahi \
MZClient
pkgconfigdir = $(libdir)/pkgconfig
Property changes on: trunk/Mono.Zeroconf/src/Mono.Zeroconf
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
*.dll
+ Makefile
Makefile.in
*.dll
*.exe
*.mdb
*.pidb
Modified: trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2007-08-21 17:35:59 UTC
(rev 84570)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2007-08-21 17:38:56 UTC
(rev 84571)
@@ -2,7 +2,7 @@
ASSEMBLY = $(ASSEMBLY_NAME).dll
assemblydir = $(libdir)/mono-zeroconf
-assembly_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).config
+assembly_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
MONO_ZEROCONF_SRC = \
Mono.Zeroconf/IRegisterService.cs \
@@ -11,40 +11,32 @@
Mono.Zeroconf/IService.cs \
Mono.Zeroconf/ITxtRecord.cs \
Mono.Zeroconf/RegisterService.cs \
+ Mono.Zeroconf/ServiceBrowseEventArgs.cs \
+ Mono.Zeroconf/ServiceBrowseEventHandler.cs \
Mono.Zeroconf/ServiceBrowser.cs \
+ Mono.Zeroconf/ServiceResolvedEventArgs.cs \
+ Mono.Zeroconf/ServiceResolvedEventHandler.cs \
Mono.Zeroconf/TxtRecord.cs \
- Mono.Zeroconf/TxtRecordItem.cs \
- Mono.Zeroconf/ZeroconfProvider.cs
+ Mono.Zeroconf/TxtRecordItem.cs
-MONO_ZEROCONF_BONJOUR_SRC = \
- Mono.Zeroconf.Bonjour/BrowseService.cs \
- Mono.Zeroconf.Bonjour/Native.cs \
- Mono.Zeroconf.Bonjour/RegisterService.cs \
- Mono.Zeroconf.Bonjour/ServiceBrowser.cs \
- Mono.Zeroconf.Bonjour/ServiceClass.cs \
- Mono.Zeroconf.Bonjour/Service.cs \
- Mono.Zeroconf.Bonjour/ServiceError.cs \
- Mono.Zeroconf.Bonjour/ServiceErrorException.cs \
- Mono.Zeroconf.Bonjour/ServiceFlags.cs \
- Mono.Zeroconf.Bonjour/ServiceRef.cs \
- Mono.Zeroconf.Bonjour/ServiceType.cs \
- Mono.Zeroconf.Bonjour/TxtRecord.cs \
- Mono.Zeroconf.Bonjour/TxtRecordEnumerator.cs \
- Mono.Zeroconf.Bonjour/ZeroconfProvider.cs
+MONO_ZEROCONF_PROVIDERS_SRC = \
+ Mono.Zeroconf.Providers/IZeroconfProvider.cs \
+ Mono.Zeroconf.Providers/ZeroconfProviderAttribute.cs \
+ Mono.Zeroconf.Providers/ProviderFactory.cs
SOURCES_PRE = \
$(MONO_ZEROCONF_SRC) \
- $(MONO_ZEROCONF_BONJOUR_SRC)
+ $(MONO_ZEROCONF_PROVIDERS_SRC)
SOURCES = $(foreach source,$(SOURCES_PRE),$(srcdir)/$(source))
all: $(ASSEMBLY)
$(ASSEMBLY): $(SOURCES)
- $(MCS) -target:library -out:$@ $(SOURCES)
+ $(MCS) -debug -target:library -out:$@ $(SOURCES)
-EXTRA_DIST = $(SOURCES) $(ASSEMBLY).config
-CLEANFILES = $(ASSEMBLY)
-MAINTAINERCLEANFILES = \
- Makefile.in
+EXTRA_DIST = $(SOURCES)
+CLEANFILES = *.dll *.mdb
+DISTCLEANFILES = *.pidb
+MAINTAINERCLEANFILES = Makefile.in
Copied:
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
(from rev 84567,
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ZeroconfProvider.cs)
Deleted:
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ZeroconfProvider.cs
===================================================================
---
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ZeroconfProvider.cs
2007-08-21 17:35:59 UTC (rev 84570)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ZeroconfProvider.cs
2007-08-21 17:38:56 UTC (rev 84571)
@@ -1,101 +0,0 @@
-//
-// ProviderFactory.cs
-//
-// Authors:
-// Aaron Bockover <[EMAIL PROTECTED]>
-//
-// Copyright (C) 2006-2007 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Collections;
-
-namespace Mono.Zeroconf.Providers
-{
- internal static class ProviderFactory
- {
- private static IZeroconfProvider [] providers;
- private static IZeroconfProvider selected_provider;
-
- private static IZeroconfProvider DefaultProvider {
- get {
- if(providers == null) {
- GetProviders();
- }
-
- return providers[0];
- }
- }
-
- public static IZeroconfProvider SelectedProvider {
- get { return selected_provider == null ? DefaultProvider :
selected_provider; }
- set { selected_provider = value; }
- }
-
- private static IZeroconfProvider [] GetProviders()
- {
- if(providers != null) {
- return providers;
- }
-
- ArrayList providers_list = new ArrayList();
- ArrayList directories = new ArrayList();
-
- string this_asm_path = Assembly.GetExecutingAssembly().Location;
- directories.Add(Path.GetDirectoryName(this_asm_path));
-
- string env_path =
Environment.GetEnvironmentVariable("MONO_ZEROCONF_PROVIDERS");
- if(env_path != null && env_path != String.Empty) {
- foreach(string path in env_path.Split(':')) {
- if(Directory.Exists(path)) {
- directories.Add(path);
- }
- }
- }
-
- foreach(string directory in directories) {
- foreach(string file in Directory.GetFiles(directory,
"Mono.Zeroconf.*.dll")) {
- if(Path.GetFileName(file) !=
Path.GetFileName(this_asm_path)) {
- Assembly provider_asm = Assembly.LoadFile(file);
- foreach(Attribute attr in
provider_asm.GetCustomAttributes(false)) {
- if(attr is ZeroconfProviderAttribute) {
- Type type = (attr as
ZeroconfProviderAttribute).ProviderType;
- IZeroconfProvider provider =
(IZeroconfProvider)Activator.CreateInstance(type);
- try {
- provider.Initialize();
- providers_list.Add(provider);
- } catch {
- }
- }
- }
- }
- }
- }
-
- providers = providers_list.ToArray(typeof(IZeroconfProvider)) as
IZeroconfProvider [];
-
- return providers;
- }
- }
-}
Deleted: trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.dll.config
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.dll.config
2007-08-21 17:35:59 UTC (rev 84570)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.dll.config
2007-08-21 17:38:56 UTC (rev 84571)
@@ -1,7 +0,0 @@
-<configuration>
- <dllmap dll="dnssd.dll" target="libnss_mdns-0.2.so" />
-
- <!-- Avahi Compat Library ;; doesn't work -->
- <!--<dllmap dll="mdns" target="libdns_sd.so" />-->
-</configuration>
-
Added: trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.mdp
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.mdp 2007-08-21
17:35:59 UTC (rev 84570)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.mdp 2007-08-21
17:38:56 UTC (rev 84571)
@@ -0,0 +1,33 @@
+<Project name="Mono.Zeroconf" fileversion="2.0" language="C#"
clr-version="Net_1_1" ctype="DotNetProject">
+ <Configurations active="Debug">
+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+ <Output directory="./" assembly="Mono.Zeroconf" />
+ <Build debugmode="True" target="Library" />
+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+ <CodeGeneration compiler="Csc" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" mainclass=""
generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+ </Configuration>
+ </Configurations>
+ <DeployTargets />
+ <Contents>
+ <File name="./Mono.Zeroconf/RegisterService.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ServiceBrowser.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/TxtRecord.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/TxtRecordItem.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ServiceBrowseEventArgs.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ServiceResolvedEventArgs.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ServiceResolvedEventHandler.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ServiceBrowseEventHandler.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/ITxtRecord.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/IServiceBrowser.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/IService.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/IResolvableService.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf/IRegisterService.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers/IZeroconfProvider.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers/ZeroconfProviderAttribute.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers/ProviderFactory.cs" subtype="Code"
buildaction="Compile" />
+ </Contents>
+ <References>
+ <ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Web,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ </References>
+</Project>
\ No newline at end of file
Property changes on: trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Avahi
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
*.dll
+ Makefile
Makefile.in
*.dll
*.exe
*.pidb
*.mdb
Property changes on: trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
*.exe
*.dll
*.mdb
*.pidb
Added:
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour.mdp
===================================================================
---
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour.mdp
2007-08-21 17:35:59 UTC (rev 84570)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf.Providers.Bonjour/Mono.Zeroconf.Providers.Bonjour.mdp
2007-08-21 17:38:56 UTC (rev 84571)
@@ -0,0 +1,32 @@
+<Project name="Mono.Zeroconf.Providers.Bonjour" fileversion="2.0"
language="C#" clr-version="Net_1_1" ctype="DotNetProject">
+ <Configurations active="Debug">
+ <Configuration name="Debug" ctype="DotNetProjectConfiguration">
+ <Output directory="./" assembly="Mono.Zeroconf.Providers.Bonjour" />
+ <Build debugmode="True" target="Library" />
+ <Execution runwithwarnings="True" consolepause="True" runtime="MsNet"
clr-version="Net_1_1" />
+ <CodeGeneration compiler="Csc" warninglevel="4" optimize="True"
unsafecodeallowed="False" generateoverflowchecks="True" mainclass=""
generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
+ </Configuration>
+ </Configurations>
+ <DeployTargets />
+ <Contents>
+ <File name="./Mono.Zeroconf.Providers.Bonjour/BrowseService.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/Native.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/RegisterService.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/Service.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceBrowser.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceClass.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceError.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceErrorException.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceFlags.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceRef.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ServiceType.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/TxtRecord.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/TxtRecordEnumerator.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./Mono.Zeroconf.Providers.Bonjour/ZeroconfProvider.cs"
subtype="Code" buildaction="Compile" />
+ </Contents>
+ <References>
+ <ProjectReference type="Project" localcopy="True" refto="Mono.Zeroconf" />
+ <ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <ProjectReference type="Gac" localcopy="True" refto="System.Web,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ </References>
+</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
