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 svn path=/trunk/Mono.Zeroconf/; revision=84924
sjvanrossum · Aug 27, 2007 · f97b6f1 · f97b6f1
1 parent 5b305df
commit f97b6f1
Show file tree

Hide file tree

Showing 29 changed files with 192 additions and 419 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,20 @@
+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

diff --git a/configure.ac b/configure.ac
@@ -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 @@ AM_MAINTAINER_MODE
 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 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
 	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)
 

diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -8,12 +8,7 @@ ASSEMBLIES_BUILD = $(foreach asm,$(ASSEMBLIES),$(addprefix -assembly:,$(asm)))
 
 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 @@ monodoc_DATA = \
 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 @@ endif
 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 @@ DISTCLEANFILES = \
 MAINTAINERCLEANFILES = \
 	Makefile.in
 
-CLEANFILES = \
-	MonodocNodeConfig.exe
-
diff --git a/docs/MonodocNodeConfig.cs b/docs/MonodocNodeConfig.cs
diff --git a/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml b/docs/en/Mono.Zeroconf.Providers/IZeroconfProvider.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml b/docs/en/Mono.Zeroconf.Providers/ZeroconfProviderAttribute.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/IRegisterService.xml b/docs/en/Mono.Zeroconf/IRegisterService.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/IResolvableService.xml b/docs/en/Mono.Zeroconf/IResolvableService.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/IService.xml b/docs/en/Mono.Zeroconf/IService.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/IServiceBrowser.xml b/docs/en/Mono.Zeroconf/IServiceBrowser.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/ITxtRecord.xml b/docs/en/Mono.Zeroconf/ITxtRecord.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/RegisterService.xml b/docs/en/Mono.Zeroconf/RegisterService.xml
@@ -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>

diff --git a/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml b/docs/en/Mono.Zeroconf/RegisterServiceEventArgs.xml
@@ -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>