Author: abock
Date: 2007-08-27 19:33:39 -0400 (Mon, 27 Aug 2007)
New Revision: 84924
Added:
trunk/Mono.Zeroconf/src/mono-zeroconf.snk
Removed:
trunk/Mono.Zeroconf/docs/MonodocNodeConfig.cs
Modified:
trunk/Mono.Zeroconf/ChangeLog
trunk/Mono.Zeroconf/configure.ac
trunk/Mono.Zeroconf/docs/Makefile.am
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IRegisterService.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IResolvableService.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IService.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IServiceBrowser.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ITxtRecord.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterService.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventHandler.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventArgs.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventHandler.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowser.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceErrorCode.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventArgs.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventHandler.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecord.xml
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecordItem.xml
trunk/Mono.Zeroconf/docs/en/index.xml
trunk/Mono.Zeroconf/docs/mono-zeroconf-docs.source
trunk/Mono.Zeroconf/src/Makefile.am
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
trunk/Mono.Zeroconf/src/mono-zeroconf.pc.in
Log:
2007-08-27 Aaron Bockover <[EMAIL PROTECTED]>
* configure.ac: Check for gacutil
* src/mono-zeroconf.pc.in: Updated to reflect GAC path
* src/mono-zeroconf.snk: Added strong name key file
* src/Makefile.am: Keyfile
* src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs: Support
loading plugins from the libdir location based on the GAC assembly path
* src/Mono.Zeroconf/Makefile.am: Install into the GAC
* docs/Makefile.am: Fixed up to not need MonodocNodeConfig
Modified: trunk/Mono.Zeroconf/ChangeLog
===================================================================
--- trunk/Mono.Zeroconf/ChangeLog 2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/ChangeLog 2007-08-27 23:33:39 UTC (rev 84924)
@@ -1,5 +1,22 @@
2007-08-27 Aaron Bockover <[EMAIL PROTECTED]>
+ * configure.ac: Check for gacutil
+
+ * src/mono-zeroconf.pc.in: Updated to reflect GAC path
+
+ * src/mono-zeroconf.snk: Added strong name key file
+
+ * src/Makefile.am: Keyfile
+
+ * src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs: Support
+ loading plugins from the libdir location based on the GAC assembly path
+
+ * src/Mono.Zeroconf/Makefile.am: Install into the GAC
+
+ * docs/Makefile.am: Fixed up to not need MonodocNodeConfig
+
+2007-08-27 Aaron Bockover <[EMAIL PROTECTED]>
+
* src/MZClient/ZeroconfClient.cs: Make the default browse type
_workstation
2007-08-23 Aaron Bockover <[EMAIL PROTECTED]>
Modified: trunk/Mono.Zeroconf/configure.ac
===================================================================
--- trunk/Mono.Zeroconf/configure.ac 2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/configure.ac 2007-08-27 23:33:39 UTC (rev 84924)
@@ -1,4 +1,4 @@
-AC_INIT([Mono.Zeroconf], [0.7.0])
+AC_INIT([Mono.Zeroconf], [0.7.1])
AC_CANONICAL_SYSTEM
AC_PREREQ(2.13)
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
@@ -7,8 +7,7 @@
DISTCHECK_CONFIGURE_FLAGS="--disable-docs"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-#ASM_VERSION="$VERSION.*"
-ASM_VERSION="0.8.0.*"
+ASM_VERSION="1.0.0.0"
AC_SUBST(ASM_VERSION)
AC_PROG_INSTALL
@@ -22,6 +21,11 @@
System.Web
])
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno"; then
+ AC_MSG_ERROR([You need to install gacutil])
+fi
+
AC_ARG_ENABLE(avahi, AC_HELP_STRING([--disable-avahi],
[Do not build with Avahi support]), , enable_avahi=yes)
Modified: trunk/Mono.Zeroconf/docs/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/docs/Makefile.am 2007-08-27 22:49:14 UTC (rev
84923)
+++ trunk/Mono.Zeroconf/docs/Makefile.am 2007-08-27 23:33:39 UTC (rev
84924)
@@ -8,12 +8,7 @@
if BUILD_DOCS
-all: MonodocNodeConfig.exe
-
-MonodocNodeConfig.exe: MonodocNodeConfig.cs
- mcs -out:$@ -r:System.Xml $<
-
-monodocdir = $(DESTDIR)$(DOCDIR)
+monodocdir = $(DOCDIR)
monodoc_DATA = \
mono-zeroconf-docs.zip \
mono-zeroconf-docs.tree \
@@ -22,12 +17,6 @@
mono-zeroconf-docs.zip mono-zeroconf-docs.tree: $(srcdir)/en/*/*.xml
$(srcdir)/en/*.xml
$(DOC_ASSEMBLER) $(srcdir)/en
-install-data-hook:
- $(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --insert
"Mono.Zeroconf Libraries" classlib-mono-zeroconf $(DOCDIR)/../monodoc.xml
-
-uninstall-hook:
- $(MONO) $(top_builddir)/docs/MonodocNodeConfig.exe --remove
classlib-mono-zeroconf $(DOCDIR)/../monodoc.xml
-
update-docs: $(ASSEMBLIES)
$(DOC_UPDATER) $(ASSEMBLIES_BUILD) -path:en/
@@ -46,8 +35,7 @@
EXTRA_DIST = \
$(srcdir)/en/*/*.xml \
$(srcdir)/en/*.xml \
- mono-zeroconf-docs.source \
- MonodocNodeConfig.cs
+ mono-zeroconf-docs.source
DISTCLEANFILES = \
mono-zeroconf-docs.zip \
@@ -56,6 +44,3 @@
MAINTAINERCLEANFILES = \
Makefile.in
-CLEANFILES = \
- MonodocNodeConfig.exe
-
Deleted: trunk/Mono.Zeroconf/docs/MonodocNodeConfig.cs
===================================================================
--- trunk/Mono.Zeroconf/docs/MonodocNodeConfig.cs 2007-08-27 22:49:14 UTC
(rev 84923)
+++ trunk/Mono.Zeroconf/docs/MonodocNodeConfig.cs 2007-08-27 23:33:39 UTC
(rev 84924)
@@ -1,136 +0,0 @@
-/***************************************************************************
- * MonodocNodeConfig.cs
- *
- * Copyright (C) 2005 Novell
- * Written by Aaron Bockover ([EMAIL PROTECTED])
- ****************************************************************************/
-
-/* THIS FILE IS LICENSED UNDER THE MIT LICENSE AS OUTLINED IMMEDIATELY BELOW:
- *
- * 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.Xml;
-
-public static class MonodocNodeConfig
-{
- private static XmlDocument document;
-
- public static int Main(string [] args)
- {
- bool insert_mode = false;
- string xml_file = null;
- string label = null;
- string name = null;
-
- switch(args[0]) {
- case "--insert":
- if(args.Length != 4) {
- PrintUsage();
- return 0;
- }
-
- insert_mode = true;
- label = args[1];
- name = args[2];
- xml_file = args[3];
- break;
- case "--remove":
- if(args.Length != 3) {
- PrintUsage();
- return 0;
- }
-
- insert_mode = false;
- name = args[1];
- xml_file = args[2];
- break;
- default:
- PrintUsage();
- return 0;
- }
-
- document = new XmlDocument();
- document.Load(xml_file);
-
- RemoveNode(name);
-
- if(insert_mode) {
- InsertNode(label, name);
- }
-
- try {
- document.Save(xml_file);
- } catch {
- Console.WriteLine("Couldn\'t insert node!");
- return 1;
- }
- return 0;
- }
-
- private static void PrintUsage()
- {
- Console.WriteLine("Usage is:");
- Console.WriteLine("MonodocNodeConfig.exe --insert|--remove [options]
<monodoc XML file>\n");
- Console.WriteLine("Where [options] for --insert must be:");
- Console.WriteLine(" <label> <name>\n");
- Console.WriteLine("Where [options] for --remove must be:");
- Console.WriteLine(" <name>\n");
- }
-
- private static void RemoveNode(string name)
- {
- foreach(XmlNode node in document.DocumentElement) {
- if(node.Attributes["name"].Value != "various") {
- continue;
- }
-
- foreach(XmlNode child in node) {
- if(child.Attributes["name"].Value == name) {
- node.RemoveChild(child);
- return;
- }
- }
- }
- }
-
- private static void InsertNode(string label, string name)
- {
- foreach(XmlNode node in document.DocumentElement) {
- if(node.Attributes["name"].Value != "various") {
- continue;
- }
-
- XmlNode insert_node = document.CreateNode(XmlNodeType.Element,
"node", "");
-
- XmlAttribute label_attr = document.CreateAttribute("label");
- label_attr.Value = label;
- insert_node.Attributes.Append(label_attr);
-
- XmlAttribute name_attr = document.CreateAttribute("name");
- name_attr.Value = name;
- insert_node.Attributes.Append(name_attr);
-
- node.AppendChild(insert_node);
-
- return;
- }
- }
-}
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IRegisterService.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IRegisterService.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IRegisterService.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface IRegisterService :
IDisposable, Mono.Zeroconf.IService" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces>
<Interface>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IResolvableService.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IResolvableService.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IResolvableService.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface IResolvableService :
Mono.Zeroconf.IService" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces>
<Interface>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IService.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IService.xml 2007-08-27
22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IService.xml 2007-08-27
23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface IService" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces />
<Docs>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IServiceBrowser.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IServiceBrowser.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/IServiceBrowser.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface IServiceBrowser :
IDisposable" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces>
<Interface>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ITxtRecord.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ITxtRecord.xml 2007-08-27
22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ITxtRecord.xml 2007-08-27
23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface ITxtRecord :
IDisposable, System.Collections.IEnumerable" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces>
<Interface>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterService.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterService.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterService.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class RegisterService :
Mono.Zeroconf.IRegisterService" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class RegisterServiceEventArgs :
EventArgs" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.EventArgs</BaseTypeName>
@@ -13,66 +13,35 @@
<remarks>To be added.</remarks>
</Docs>
<Members>
+
+
+
+
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public RegisterServiceEventArgs
();" />
<MemberType>Constructor</MemberType>
<Parameters />
- <Docs>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
- </Member>
- <Member MemberName=".ctor">
+ <Docs><summary>To be added.</summary><remarks>To be
added.</remarks></Docs>
+ </Member><Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public RegisterServiceEventArgs
(Mono.Zeroconf.IRegisterService service, bool isRegistered,
Mono.Zeroconf.ServiceErrorCode error);" />
<MemberType>Constructor</MemberType>
- <Parameters>
- <Parameter Name="service" Type="Mono.Zeroconf.IRegisterService" />
- <Parameter Name="isRegistered" Type="System.Boolean" />
- <Parameter Name="error" Type="Mono.Zeroconf.ServiceErrorCode" />
- </Parameters>
- <Docs>
- <param name="service">To be added.</param>
- <param name="isRegistered">To be added.</param>
- <param name="error">To be added.</param>
- <summary>To be added.</summary>
- <remarks>To be added.</remarks>
- </Docs>
- </Member>
- <Member MemberName="IsRegistered">
+ <Parameters><Parameter Name="service"
Type="Mono.Zeroconf.IRegisterService" /><Parameter Name="isRegistered"
Type="System.Boolean" /><Parameter Name="error"
Type="Mono.Zeroconf.ServiceErrorCode" /></Parameters>
+ <Docs><param name="service">To be added.</param><param
name="isRegistered">To be added.</param><param name="error">To be
added.</param><summary>To be added.</summary><remarks>To be
added.</remarks></Docs>
+ </Member><Member MemberName="IsRegistered">
<MemberSignature Language="C#" Value="public bool IsRegistered { set;
get; };" />
<MemberType>Property</MemberType>
- <ReturnValue>
- <ReturnType>System.Boolean</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- <value>To be added.</value>
- <remarks>To be added.</remarks>
- </Docs>
- </Member>
- <Member MemberName="Service">
+ <ReturnValue><ReturnType>System.Boolean</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary><value>To be
added.</value><remarks>To be added.</remarks></Docs>
+ </Member><Member MemberName="Service">
<MemberSignature Language="C#" Value="public
Mono.Zeroconf.IRegisterService Service { set; get; };" />
<MemberType>Property</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.IRegisterService</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- <value>To be added.</value>
- <remarks>To be added.</remarks>
- </Docs>
- </Member>
- <Member MemberName="ServiceError">
+
<ReturnValue><ReturnType>Mono.Zeroconf.IRegisterService</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary><value>To be
added.</value><remarks>To be added.</remarks></Docs>
+ </Member><Member MemberName="ServiceError">
<MemberSignature Language="C#" Value="public
Mono.Zeroconf.ServiceErrorCode ServiceError { set; get; };" />
<MemberType>Property</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- <value>To be added.</value>
- <remarks>To be added.</remarks>
- </Docs>
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary><value>To be
added.</value><remarks>To be added.</remarks></Docs>
</Member>
</Members>
</Type>
Modified:
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventHandler.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventHandler.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/RegisterServiceEventHandler.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public delegate void
RegisterServiceEventHandler(object o, RegisterServiceEventArgs args);" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventArgs.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventArgs.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventArgs.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class ServiceBrowseEventArgs :
EventArgs" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.EventArgs</BaseTypeName>
Modified:
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventHandler.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventHandler.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowseEventHandler.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public delegate void
ServiceBrowseEventHandler(object o, ServiceBrowseEventArgs args);" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowser.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowser.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceBrowser.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class ServiceBrowser :
Mono.Zeroconf.IServiceBrowser" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceErrorCode.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceErrorCode.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceErrorCode.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public enum ServiceErrorCode" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Enum</BaseTypeName>
@@ -12,235 +12,143 @@
<remarks>To be added.</remarks>
</Docs>
<Members>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<Member MemberName="AlreadyRegistered">
<MemberSignature Language="C#" Value="AlreadyRegistered" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadFlags">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadFlags">
<MemberSignature Language="C#" Value="BadFlags" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadInterfaceIndex">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadInterfaceIndex">
<MemberSignature Language="C#" Value="BadInterfaceIndex" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadParam">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadParam">
<MemberSignature Language="C#" Value="BadParam" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadReference">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadReference">
<MemberSignature Language="C#" Value="BadReference" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadState">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadState">
<MemberSignature Language="C#" Value="BadState" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="BadTime">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="BadTime">
<MemberSignature Language="C#" Value="BadTime" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="DoubleNAT">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="DoubleNAT">
<MemberSignature Language="C#" Value="DoubleNAT" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Firewall">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Firewall">
<MemberSignature Language="C#" Value="Firewall" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Incompatible">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Incompatible">
<MemberSignature Language="C#" Value="Incompatible" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Invalid">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Invalid">
<MemberSignature Language="C#" Value="Invalid" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NameConflict">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NameConflict">
<MemberSignature Language="C#" Value="NameConflict" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NATTraversal">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NATTraversal">
<MemberSignature Language="C#" Value="NATTraversal" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NoAuth">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NoAuth">
<MemberSignature Language="C#" Value="NoAuth" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NoMemory">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NoMemory">
<MemberSignature Language="C#" Value="NoMemory" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="None">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="None">
<MemberSignature Language="C#" Value="None" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NoSuchKey">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NoSuchKey">
<MemberSignature Language="C#" Value="NoSuchKey" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NoSuchName">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NoSuchName">
<MemberSignature Language="C#" Value="NoSuchName" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NoSuchRecord">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NoSuchRecord">
<MemberSignature Language="C#" Value="NoSuchRecord" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="NotInitialized">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="NotInitialized">
<MemberSignature Language="C#" Value="NotInitialized" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Refused">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Refused">
<MemberSignature Language="C#" Value="Refused" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Unknown">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Unknown">
<MemberSignature Language="C#" Value="Unknown" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
- </Member>
- <Member MemberName="Unsupported">
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
+ </Member><Member MemberName="Unsupported">
<MemberSignature Language="C#" Value="Unsupported" />
<MemberType>Field</MemberType>
- <ReturnValue>
- <ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType>
- </ReturnValue>
- <Docs>
- <summary>To be added.</summary>
- </Docs>
+
<ReturnValue><ReturnType>Mono.Zeroconf.ServiceErrorCode</ReturnType></ReturnValue>
+ <Docs><summary>To be added.</summary></Docs>
</Member>
</Members>
</Type>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventArgs.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventArgs.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventArgs.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class ServiceResolvedEventArgs :
EventArgs" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.EventArgs</BaseTypeName>
Modified:
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventHandler.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventHandler.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/ServiceResolvedEventHandler.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public delegate void
ServiceResolvedEventHandler(object o, ServiceResolvedEventArgs args);" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecord.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecord.xml 2007-08-27
22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecord.xml 2007-08-27
23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class TxtRecord :
Mono.Zeroconf.ITxtRecord" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecordItem.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecordItem.xml 2007-08-27
22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf/TxtRecordItem.xml 2007-08-27
23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class TxtRecordItem" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
Modified:
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public interface IZeroconfProvider" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Interfaces />
<Docs>
Modified:
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml
===================================================================
---
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml
2007-08-27 22:49:14 UTC (rev 84923)
+++
trunk/Mono.Zeroconf/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
<TypeSignature Language="C#" Value="public class ZeroconfProviderAttribute :
Attribute" />
<AssemblyInfo>
<AssemblyName>Mono.Zeroconf</AssemblyName>
- <AssemblyVersion>0.8.0.28892</AssemblyVersion>
+ <AssemblyVersion>1.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Attribute</BaseTypeName>
Modified: trunk/Mono.Zeroconf/docs/en/index.xml
===================================================================
--- trunk/Mono.Zeroconf/docs/en/index.xml 2007-08-27 22:49:14 UTC (rev
84923)
+++ trunk/Mono.Zeroconf/docs/en/index.xml 2007-08-27 23:33:39 UTC (rev
84924)
@@ -1,6 +1,6 @@
<Overview>
<Assemblies>
- <Assembly Name="Mono.Zeroconf" Version="0.8.0.28892">
+ <Assembly Name="Mono.Zeroconf" Version="1.0.0.0">
<Attributes>
<Attribute>
<AttributeName>System.Runtime.CompilerServices.RuntimeCompatibility(WrapNonExceptionThrows=true)</AttributeName>
Modified: trunk/Mono.Zeroconf/docs/mono-zeroconf-docs.source
===================================================================
--- trunk/Mono.Zeroconf/docs/mono-zeroconf-docs.source 2007-08-27 22:49:14 UTC
(rev 84923)
+++ trunk/Mono.Zeroconf/docs/mono-zeroconf-docs.source 2007-08-27 23:33:39 UTC
(rev 84924)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<monodoc>
- <source provider="ecma" basefile="mono-zeroconf-docs"
path="classlib-mono-zeroconf" />
+ <source provider="ecma" basefile="mono-zeroconf-docs" path="various"
title="Mono.Zeroconf" />
</monodoc>
Modified: trunk/Mono.Zeroconf/src/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Makefile.am 2007-08-27 22:49:14 UTC (rev 84923)
+++ trunk/Mono.Zeroconf/src/Makefile.am 2007-08-27 23:33:39 UTC (rev 84924)
@@ -7,8 +7,14 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mono-zeroconf.pc
+uninstall-hook:
+ if test $$(find $(pkglibdir) | wc -l) -eq 1; then \
+ rmdir $(pkglibdir); \
+ fi
+
EXTRA_DIST = \
- mono-zeroconf.pc.in
+ mono-zeroconf.pc.in \
+ mono-zeroconf.snk
DISTCLEANFILES = \
mono-zeroconf.pc
Modified: trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2007-08-27 22:49:14 UTC
(rev 84923)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2007-08-27 23:33:39 UTC
(rev 84924)
@@ -1,8 +1,8 @@
ASSEMBLY_NAME = Mono.Zeroconf
ASSEMBLY = $(ASSEMBLY_NAME).dll
-assemblydir = $(libdir)/mono-zeroconf
-assembly_SCRIPTS = $(ASSEMBLY) $(ASSEMBLY).mdb
+assemblydir = $(libdir)/mono/mono-zeroconf
+assembly_SCRIPTS = $(ASSEMBLY).mdb
MONO_ZEROCONF_SRC = \
Mono.Zeroconf/IRegisterService.cs \
@@ -38,8 +38,16 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(SOURCES)
- $(MCS) -debug -target:library -out:$@ $(SOURCES)
+ $(MCS) -debug -keyfile:$(top_srcdir)/src/mono-zeroconf.snk
-target:library -out:$@ $(SOURCES)
+GACUTIL_ARGS = -package $(PACKAGE) -root $(DESTDIR)$(libdir) -gacdir $(libdir)
+
+install-data-hook:
+ $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_ARGS)
+
+uninstall-hook:
+ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_ARGS)
+
EXTRA_DIST = $(SOURCES)
CLEANFILES = *.dll *.mdb
DISTCLEANFILES = *.pidb
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-27 22:49:14 UTC (rev 84923)
+++
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Mono.Zeroconf.Providers/ProviderFactory.cs
2007-08-27 23:33:39 UTC (rev 84924)
@@ -2,7 +2,7 @@
// ProviderFactory.cs
//
// Authors:
-// Aaron Bockover <[EMAIL PROTECTED]>
+// Aaron Bockover <[EMAIL PROTECTED]>
//
// Copyright (C) 2006-2007 Novell, Inc (http://www.novell.com)
//
@@ -29,7 +29,7 @@
using System;
using System.IO;
using System.Reflection;
-using System.Collections;
+using System.Collections.Generic;
namespace Mono.Zeroconf.Providers
{
@@ -59,14 +59,15 @@
return providers;
}
- ArrayList providers_list = new ArrayList();
- ArrayList directories = new ArrayList();
+ List<IZeroconfProvider> providers_list = new
List<IZeroconfProvider>();
+ List<string> directories = new List<string>();
+ Assembly asm = Assembly.GetExecutingAssembly();
- string this_asm_path = Assembly.GetExecutingAssembly().Location;
+ string this_asm_path = asm.Location;
directories.Add(Path.GetDirectoryName(this_asm_path));
string env_path =
Environment.GetEnvironmentVariable("MONO_ZEROCONF_PROVIDERS");
- if(env_path != null && env_path != String.Empty) {
+ if(!String.IsNullOrEmpty(env_path)) {
foreach(string path in env_path.Split(':')) {
if(Directory.Exists(path)) {
directories.Add(path);
@@ -74,6 +75,17 @@
}
}
+ if(Assembly.GetExecutingAssembly().GlobalAssemblyCache) {
+ string [] path_parts =
directories[0].Split(Path.DirectorySeparatorChar);
+ string new_path = Path.DirectorySeparatorChar.ToString();
+
+ for(int i = 0; i < path_parts.Length - 4; i++) {
+ new_path = Path.Combine(new_path, path_parts[i]);
+ }
+
+ directories.Add(Path.Combine(new_path, "mono-zeroconf"));
+ }
+
foreach(string directory in directories) {
foreach(string file in Directory.GetFiles(directory, "*.dll"))
{
if(Path.GetFileName(file) !=
Path.GetFileName(this_asm_path)) {
@@ -85,7 +97,7 @@
try {
provider.Initialize();
providers_list.Add(provider);
- } catch {
+ } catch {
}
}
}
@@ -93,7 +105,7 @@
}
}
- providers = providers_list.ToArray(typeof(IZeroconfProvider)) as
IZeroconfProvider [];
+ providers = providers_list.ToArray();
return providers;
}
Modified: trunk/Mono.Zeroconf/src/mono-zeroconf.pc.in
===================================================================
--- trunk/Mono.Zeroconf/src/mono-zeroconf.pc.in 2007-08-27 22:49:14 UTC (rev
84923)
+++ trunk/Mono.Zeroconf/src/mono-zeroconf.pc.in 2007-08-27 23:33:39 UTC (rev
84924)
@@ -6,5 +6,5 @@
Description: Mono library for universal cross platform Zeroconf support via a
unified API with built in support for mdnsd and optional support for Avahi.
Version: @VERSION@
Requires:
-Libs: -r:${libdir}/mono-zeroconf/Mono.Zeroconf.dll
+Libs: -r:${libdir}/mono/mono-zeroconf/Mono.Zeroconf.dll
Added: trunk/Mono.Zeroconf/src/mono-zeroconf.snk
===================================================================
(Binary files differ)
Property changes on: trunk/Mono.Zeroconf/src/mono-zeroconf.snk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches