From c07a5f558004befe04a70bf2baf9bffe98bdccc4 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 21 Oct 2008 22:50:21 +0000 Subject: [PATCH] 2008-10-21 Mike Kestner * cairo/*: add a policy assembly for 1.0 defering to 2.0. svn path=/trunk/gtk-sharp/; revision=116692 --- ChangeLog | 4 ++++ cairo/Makefile.am | 27 ++++++++++++++++++++------- cairo/policy.1.0.config | 10 ++++++++++ configure.in.in | 5 +++-- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 cairo/policy.1.0.config diff --git a/ChangeLog b/ChangeLog index 222d2b086..ce4484df6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-10-21 Mike Kestner + + * cairo/*: add a policy assembly for 1.0 defering to 2.0. + 2008-10-13 Brad Taylor * Makefile.am: diff --git a/cairo/Makefile.am b/cairo/Makefile.am index 22792ae1b..687a1ce0a 100644 --- a/cairo/Makefile.am +++ b/cairo/Makefile.am @@ -1,15 +1,17 @@ ASSEMBLY_NAME = Mono.Cairo ASSEMBLY = $(ASSEMBLY_NAME).dll +POLICY_ASSEMBLY = policy.1.0.$(ASSEMBLY) +POLICY_CONFIG = policy.1.0.config if ENABLE_MONO_CAIRO -TARGET=$(ASSEMBLY) +TARGET=$(ASSEMBLY) $(POLICY_ASSEMBLY) else TARGET= endif noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLY) $(POLICY_CONFIG) gtk-sharp.snk AssemblyInfo.cs sources = \ Antialias.cs \ @@ -63,29 +65,40 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -EXTRA_DIST = $(sources) - gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs - @echo "sed -e "s/@API_VERSION@/1.0.5000.0/" -e "s/\[assembly:GLib.*//" $(top_srcdir)/AssemblyInfo.cs.in > $@" - @sed -e "s/@API_VERSION@/1.0.5000.0/" -e "s/\[assembly:GLib.IgnoreClassInitializers\]//" $(top_builddir)/AssemblyInfo.cs > $@ + @echo "sed -e "s/@API_VERSION@/2.0.0.0/" -e "s/\[assembly:GLib.IgnoreClassInitializers\]//" $(top_builddir)/AssemblyInfo.cs > $@" + @sed -e "s/@API_VERSION@/2.0.0.0/" -e "s/\[assembly:GLib.IgnoreClassInitializers\]//" $(top_builddir)/AssemblyInfo.cs > $@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs @rm -f $(ASSEMBLY).mdb $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources) - $(GAPI_CDECL_INSERT) + +$(POLICY_CONFIG): $(top_builddir)/policy.config + @echo "sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@API_VERSION@/2.0.0.0/" -e "s/@POLICY@.0/1.0.5000/" $(top_builddir)/policy.config > $@" + @sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@API_VERSION@/2.0.0.0/" -e "s/@POLICY@.0/1.0.5000/" $(top_builddir)/policy.config > $@ + +$(POLICY_ASSEMBLY): $(POLICY_CONFIG) gtk-sharp.snk + echo "Creating policy.1.0.$(ASSEMBLY)"; + $(AL) -link:$(POLICY_CONFIG) -out:$@ -keyfile:gtk-sharp.snk; install-data-local: @if test -n '$(TARGET)'; then \ echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ + echo "$(GACUTIL) /i $(POLICY_ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(POLICY_ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ + echo "$(GACUTIL) /u policy.1.0.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u policy.1.0.$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi +EXTRA_DIST = $(sources) + diff --git a/cairo/policy.1.0.config b/cairo/policy.1.0.config new file mode 100644 index 000000000..67533d21c --- /dev/null +++ b/cairo/policy.1.0.config @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/configure.in.in b/configure.in.in index d7ac4d656..ceadfb954 100644 --- a/configure.in.in +++ b/configure.in.in @@ -165,7 +165,7 @@ AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) AC_SUBST(GENERATED_SOURCES) -PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= $MONO_REQUIRED_VERSION, has_mono_cairo=true, has_mono_cairo=false) +PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= $MONO_REQUIRED_VERSION, enable_mono_cairo=no, enable_mono_cairo=yes) AC_SUBST(MONO_CAIRO_LIBS) GTK_REQUIRED_VERSION=@GTK_REQUIRED_VERSION@ @@ -203,7 +203,7 @@ fi AC_SUBST(MDASSEMBLER) AC_SUBST(MONODOCER) -AM_CONDITIONAL(ENABLE_MONO_CAIRO, test "x$has_mono_cairo" = "xfalse") +AM_CONDITIONAL(ENABLE_MONO_CAIRO, test "x$enable_mono_cairo" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_DOTNET, test "x$enable_dotnet" = "xyes") AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") @@ -270,6 +270,7 @@ echo " Optional assemblies included in the build:" echo "" echo " * glade-sharp.dll: $enable_glade" echo " * gtk-dotnet.dll: $enable_dotnet " +echo " * Mono.Cairo.dll: $enable_mono_cairo " echo "" echo " NOTE: if any of the above say 'no' you may install the" echo " corresponding development packages for them, rerun"