Author: abock
Date: 2008-01-24 19:33:08 -0500 (Thu, 24 Jan 2008)
New Revision: 93869
Added:
trunk/Mono.Zeroconf/src/Makefile.include
trunk/Mono.Zeroconf/src/policy.config.in
Removed:
trunk/Mono.Zeroconf/src/policy.1.0.Mono.Zeroconf.config
Modified:
trunk/Mono.Zeroconf/ChangeLog
trunk/Mono.Zeroconf/configure.ac
trunk/Mono.Zeroconf/src/
trunk/Mono.Zeroconf/src/AssemblyInfo.cs
trunk/Mono.Zeroconf/src/Makefile.am
trunk/Mono.Zeroconf/src/Mono.Zeroconf/
trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
Log:
2008-01-24 Aaron Bockover <[EMAIL PROTECTED]>
* configure.ac: Check for al, set policy/api version variables
* src/Makefile.include: Rules for building the policy assembly and
installing/uninstalling from the GAC; stolen from Mono.Addins
* src/policy.config.in: Policy definition file
* src/Mono.Zeroconf/Makefile.am: Build and install the assembly
versioning policy
Modified: trunk/Mono.Zeroconf/ChangeLog
===================================================================
--- trunk/Mono.Zeroconf/ChangeLog 2008-01-25 00:26:52 UTC (rev 93868)
+++ trunk/Mono.Zeroconf/ChangeLog 2008-01-25 00:33:08 UTC (rev 93869)
@@ -1,3 +1,15 @@
+2008-01-24 Aaron Bockover <[EMAIL PROTECTED]>
+
+ * configure.ac: Check for al, set policy/api version variables
+
+ * src/Makefile.include: Rules for building the policy assembly and
+ installing/uninstalling from the GAC; stolen from Mono.Addins
+
+ * src/policy.config.in: Policy definition file
+
+ * src/Mono.Zeroconf/Makefile.am: Build and install the assembly
+ versioning policy
+
2008-01-23 Aaron Bockover <[EMAIL PROTECTED]>
0.7.4 Released
Modified: trunk/Mono.Zeroconf/configure.ac
===================================================================
--- trunk/Mono.Zeroconf/configure.ac 2008-01-25 00:26:52 UTC (rev 93868)
+++ trunk/Mono.Zeroconf/configure.ac 2008-01-25 00:33:08 UTC (rev 93869)
@@ -1,9 +1,14 @@
-AC_INIT([Mono.Zeroconf], [0.7.4])
+AC_INIT([Mono.Zeroconf], [0.7.5])
AC_CANONICAL_SYSTEM
AC_PREREQ(2.13)
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip])
AM_MAINTAINER_MODE
+API_VERSION="1.0.0.75"
+POLICY_VERSION="1.0"
+AC_SUBST(API_VERSION)
+AC_SUBST(POLICY_VERSION)
+
DISTCHECK_CONFIGURE_FLAGS="--disable-docs"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
@@ -23,6 +28,17 @@
AC_MSG_ERROR([You need to install gacutil])
fi
+AC_PATH_PROG(AL, al, no)
+if test "x$AL" = "xno" ; then
+ AC_MSG_ERROR([You need to install al])
+fi
+
+GACUTIL_FLAGS='-package $(PACKAGE) -root $(DESTDIR)$(prefix)/lib'
+GACUTIL_POLICY_FLAGS='-root $(DESTDIR)$(prefix)/lib'
+AC_SUBST(GACUTIL_FLAGS)
+AC_SUBST(GACUTIL_POLICY_FLAGS)
+
+
AC_ARG_ENABLE(avahi, AC_HELP_STRING([--disable-avahi],
[Do not build with Avahi support]), , enable_avahi=yes)
@@ -55,6 +71,7 @@
AC_OUTPUT([
Makefile
src/Makefile
+src/policy.config
src/mono-zeroconf.pc
src/Mono.Zeroconf/Makefile
src/Mono.Zeroconf.Providers.Bonjour/Makefile
Property changes on: trunk/Mono.Zeroconf/src
___________________________________________________________________
Name: svn:ignore
- Makefile.in
mono-zeroconf.pc
Makefile
AssemblyInfo.cs
+ Makefile.in
mono-zeroconf.pc
Makefile
AssemblyInfo.cs
*.config
Modified: trunk/Mono.Zeroconf/src/AssemblyInfo.cs
===================================================================
--- trunk/Mono.Zeroconf/src/AssemblyInfo.cs 2008-01-25 00:26:52 UTC (rev
93868)
+++ trunk/Mono.Zeroconf/src/AssemblyInfo.cs 2008-01-25 00:33:08 UTC (rev
93869)
@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly:AssemblyVersion("1.0.0.74")]
+[assembly:AssemblyVersion("1.0.0.75")]
[assembly:AssemblyTitle("Mono.Zeroconf")]
[assembly:AssemblyDescription("Cross Platform Zeroconf for .NET")]
[assembly:AssemblyCopyright("Copyright (C) 2006-2008 Novell, Inc.")]
Modified: trunk/Mono.Zeroconf/src/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Makefile.am 2008-01-25 00:26:52 UTC (rev 93868)
+++ trunk/Mono.Zeroconf/src/Makefile.am 2008-01-25 00:33:08 UTC (rev 93869)
@@ -4,23 +4,9 @@
Mono.Zeroconf.Providers.Avahi \
MZClient
-POLICIES = policy.1.0.Mono.Zeroconf.dll
-GACUTIL_POLICY_FLAGS = "/gacdir $(libdir) /root $(DESTDIR)$(libdir)"
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mono-zeroconf.pc
-all: $(POLICIES)
-
-policy.1.0.Mono.Zeroconf.dll: policy.1.0.Mono.Zeroconf.config
- al -link:$< -out:$@ -keyfile:$(srcdir)/mono-zeroconf.snk
-
-install-data-local:
- @for POLICY in $(POLICIES); do \
- echo "$(GACUTIL) /i $$POLICY /f $(GACUTIL_POLICY_FLAGS)"; \
- $(GACUTIL) /i $$POLICY /f $(GACUTIL_POLICY_FLAGS) || exit 1; \
- done
-
uninstall-hook:
if test $$(find $(pkglibdir) | wc -l) -eq 1; then \
rmdir $(pkglibdir); \
@@ -29,7 +15,8 @@
EXTRA_DIST = \
AssemblyInfo.cs \
mono-zeroconf.pc.in \
- mono-zeroconf.snk
+ mono-zeroconf.snk \
+ policy.config.in
CLEANFILES = \
*.dll
Added: trunk/Mono.Zeroconf/src/Makefile.include
===================================================================
--- trunk/Mono.Zeroconf/src/Makefile.include 2008-01-25 00:26:52 UTC (rev
93868)
+++ trunk/Mono.Zeroconf/src/Makefile.include 2008-01-25 00:33:08 UTC (rev
93869)
@@ -0,0 +1,24 @@
+POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY_NAME).dll, $(addprefix policy.,
$(POLICY_VERSION)))
+POLICY_CONFIGS = $(addsuffix .config, $(addprefix policy., $(POLICY_VERSION)))
+
+$(POLICY_ASSEMBLIES): $(top_builddir)/src/policy.config
$(top_srcdir)/src/mono-zeroconf.snk
+ for i in $(POLICY_VERSION); do \
+ echo "Creating policy.$$i.$(ASSEMBLY_NAME)"; \
+ sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/"
$(top_builddir)/src/policy.config > policy.$$i.config; \
+ $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY_NAME).dll
-keyfile:$(top_srcdir)/src/mono-zeroconf.snk; \
+ done
+
+gac-install: $(POLICY_ASSEMBLIES)
+ $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1;
+ for p in $(POLICY_ASSEMBLIES); do \
+ echo $(GACUTIL) /i $$p /f $(GACUTIL_POLICY_FLAGS) || exit 1; \
+ $(GACUTIL) /i $$p /f $(GACUTIL_POLICY_FLAGS) || exit 1; \
+ done
+
+gac-uninstall:
+ $(GACUTIL) /us $(ASSEMBLY) $(GACUTIL_FLAGS) || exit 1;
+ @for p in $(POLICY_ASSEMBLIES); do \
+ echo $(GACUTIL) /us $$p /f $(GACUTIL_POLICY_FLAGS) || exit 1; \
+ $(GACUTIL) /us $$p /f $(GACUTIL_POLICY_FLAGS) || exit 1; \
+ done
+
Property changes on: trunk/Mono.Zeroconf/src/Mono.Zeroconf
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
*.dll
*.exe
*.mdb
*.pidb
+ Makefile
Makefile.in
*.dll
*.exe
*.mdb
*.pidb
*.config
Modified: trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am
===================================================================
--- trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2008-01-25 00:26:52 UTC
(rev 93868)
+++ trunk/Mono.Zeroconf/src/Mono.Zeroconf/Makefile.am 2008-01-25 00:33:08 UTC
(rev 93869)
@@ -34,19 +34,17 @@
all: $(ASSEMBLY)
-$(ASSEMBLY): $(SOURCES)
+$(ASSEMBLY): $(SOURCES) $(POLICY_ASSEMBLIES)
$(MCS) -debug -keyfile:$(top_srcdir)/src/mono-zeroconf.snk
-target:library -out:$@ $(SOURCES)
-GACUTIL_ARGS = -package $(PACKAGE) -root $(DESTDIR)$(libdir) -gacdir $(libdir)
+install-data-local: gac-install
-install-data-hook:
- $(GACUTIL) -i $(ASSEMBLY) $(GACUTIL_ARGS)
+uninstall-local: gac-uninstall
-uninstall-hook:
- $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_ARGS)
+include $(top_srcdir)/src/Makefile.include
EXTRA_DIST = $(SOURCES) Mono.Zeroconf.csproj
-CLEANFILES = *.dll *.mdb
+CLEANFILES = *.dll *.mdb $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
DISTCLEANFILES = *.pidb
MAINTAINERCLEANFILES = Makefile.in
Deleted: trunk/Mono.Zeroconf/src/policy.1.0.Mono.Zeroconf.config
===================================================================
--- trunk/Mono.Zeroconf/src/policy.1.0.Mono.Zeroconf.config 2008-01-25
00:26:52 UTC (rev 93868)
+++ trunk/Mono.Zeroconf/src/policy.1.0.Mono.Zeroconf.config 2008-01-25
00:33:08 UTC (rev 93869)
@@ -1,10 +0,0 @@
-<configuration>
- <runtime>
- <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
- <dependentAssembly>
- <assemblyIdentity name="Mono.Zeroconf"
publicKeyToken="e60c4f4a95e1099e" />
- <bindingRedirect oldVersion="1.0.0.0-1.0.0.74" newVersion="1.0.0.74" />
- </dependentAssembly>
- </assemblyBinding>
- </runtime>
-</configuration>
Added: trunk/Mono.Zeroconf/src/policy.config.in
===================================================================
--- trunk/Mono.Zeroconf/src/policy.config.in 2008-01-25 00:26:52 UTC (rev
93868)
+++ trunk/Mono.Zeroconf/src/policy.config.in 2008-01-25 00:33:08 UTC (rev
93869)
@@ -0,0 +1,10 @@
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="@ASSEMBLY_NAME@"
publicKeyToken="e60c4f4a95e1099e" />
+ <bindingRedirect oldVersion="[EMAIL PROTECTED]@"
newVersion="@API_VERSION@"/>
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
