From c1440d52d1a5d9ae22e6d383e6c03c97621dbbae Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Thu, 10 Jun 2004 19:45:20 +0000 Subject: [PATCH] 2004-06-10 Mike Kestner * configure.in : AC_SUBST GACUTIL_FLAGS. require mono-0.95 (though it's really cvs bleeding edge.) * * AssemblyInfo.cs.in : s/pub/snk. delaysign=no. * * Makefile.am : s/pub/snk. portability fixes to csc from John Luke. Switch to GACUTIL_FLAGS. * doc/Makefile.am : don't build docs, install raw xml to the prefix. svn path=/trunk/gtk-sharp/; revision=29227 --- ChangeLog | 9 ++++ Makefile.am | 2 +- art/.cvsignore | 2 +- art/AssemblyInfo.cs.in | 4 +- art/Makefile.am | 20 ++++----- atk/.cvsignore | 2 +- atk/AssemblyInfo.cs.in | 4 +- atk/Makefile.am | 16 +++---- configure.in | 6 ++- doc/Makefile.am | 19 ++++++-- gconf/GConf.PropertyEditors/.cvsignore | 2 +- .../GConf.PropertyEditors/AssemblyInfo.cs.in | 4 +- gconf/GConf.PropertyEditors/Makefile.am | 16 +++---- gconf/GConf/.cvsignore | 2 +- gconf/GConf/AssemblyInfo.cs.in | 4 +- gconf/GConf/Makefile.am | 16 +++---- gda/.cvsignore | 2 +- gda/AssemblyInfo.cs.in | 4 +- gda/Makefile.am | 16 +++---- gdk/.cvsignore | 2 +- gdk/AssemblyInfo.cs.in | 4 +- gdk/Makefile.am | 16 +++---- glade/.cvsignore | 2 +- glade/AssemblyInfo.cs.in | 4 +- glade/Makefile.am | 16 +++---- glib/.cvsignore | 2 +- glib/AssemblyInfo.cs.in | 4 +- glib/Makefile.am | 16 +++---- glib/ObjectManager.cs | 2 +- gnome/.cvsignore | 2 +- gnome/AssemblyInfo.cs.in | 4 +- gnome/Makefile.am | 16 +++---- gnomedb/.cvsignore | 2 +- gnomedb/AssemblyInfo.cs.in | 4 +- gnomedb/Makefile.am | 16 +++---- gtk/.cvsignore | 2 +- gtk/AssemblyInfo.cs.in | 4 +- gtk/Makefile.am | 16 +++---- gtkhtml/.cvsignore | 2 +- gtkhtml/AssemblyInfo.cs.in | 4 +- gtkhtml/Makefile.am | 16 +++---- pango/.cvsignore | 2 +- pango/AssemblyInfo.cs.in | 4 +- pango/Makefile.am | 16 +++---- rsvg/.cvsignore | 2 +- rsvg/AssemblyInfo.cs.in | 4 +- rsvg/Makefile.am | 16 +++---- sample/GtkDemo/Makefile.am | 2 +- sample/Makefile.am | 44 +++++++++---------- sample/test/Makefile.am | 2 +- vte/.cvsignore | 2 +- vte/AssemblyInfo.cs.in | 4 +- vte/Makefile.am | 16 +++---- 53 files changed, 223 insertions(+), 197 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a6f1d89f..323587696 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-06-10 Mike Kestner + + * configure.in : AC_SUBST GACUTIL_FLAGS. require mono-0.95 (though + it's really cvs bleeding edge.) + * * AssemblyInfo.cs.in : s/pub/snk. delaysign=no. + * * Makefile.am : s/pub/snk. portability fixes to csc from John + Luke. Switch to GACUTIL_FLAGS. + * doc/Makefile.am : don't build docs, install raw xml to the prefix. + 2004-06-10 Todd Berman * gtk/Container.custom: add C# glue for virtualizing ChildType () diff --git a/Makefile.am b/Makefile.am index 79f095e93..b9e59a875 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ pkgconfig_DATA = gtk-sharp.pc EXTRA_DIST = \ gtk-sharp.pc.in \ - gtk-sharp.pub \ + gtk-sharp.snk \ makefile.win32 \ ChangeLog \ README \ diff --git a/art/.cvsignore b/art/.cvsignore index 37ee42963..c4d65272e 100755 --- a/art/.cvsignore +++ b/art/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/art/AssemblyInfo.cs.in b/art/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/art/AssemblyInfo.cs.in +++ b/art/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/art/Makefile.am b/art/Makefile.am index 92f121d40..b95d7e3fb 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -19,7 +19,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll apidir = $(datadir)/gapi noinst_DATA = $(TARGET) api_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = art-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -54,21 +54,21 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: - @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: - @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/atk/.cvsignore b/atk/.cvsignore index 84dd7b415..59d84007e 100644 --- a/atk/.cvsignore +++ b/atk/.cvsignore @@ -6,5 +6,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/atk/AssemblyInfo.cs.in b/atk/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/atk/AssemblyInfo.cs.in +++ b/atk/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/atk/Makefile.am b/atk/Makefile.am index 2fe5258d1..ea28a26e2 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -11,7 +11,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = @@ -43,21 +43,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --gluelib-name=atksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/configure.in b/configure.in index 045e32f4c..467966cfe 100644 --- a/configure.in +++ b/configure.in @@ -59,10 +59,11 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], fi ) -MONO_REQUIRED_VERSION=0.91.99 +MONO_REQUIRED_VERSION=0.95 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) if test "x$has_mono" = "xtrue"; then +GACUTIL_FLAGS='/package $(PACKAGE) /gacdir $(libdir)' if test `uname -s` = "Darwin"; then AC_PATH_PROG(RUNTIME, mint, no) AC_PATH_PROG(CSC, mcs, no) @@ -76,6 +77,8 @@ else fi else AC_PATH_PROG(CSC, csc.exe, no) +GACUTIL_FLAGS= + if test x$CSC = "xno"; then AC_MSG_ERROR([You need to install either mono or .Net]) else @@ -98,6 +101,7 @@ fi AC_SUBST(RUNTIME) AC_SUBST(CSC) AC_SUBST(GACUTIL) +AC_SUBST(GACUTIL_FLAGS) AC_SUBST(LIB_PREFIX) AC_SUBST(LIB_SUFFIX) diff --git a/doc/Makefile.am b/doc/Makefile.am index 9d7dc6e4f..6e44a9e01 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ if ENABLE_MONODOC -TARGETS = gtk-sharp-docs.zip gtk-sharp-docs.tree gtk-sharp-docs.source -docsdir = `$(MONODOC) --get-sourcesdir` +TARGETS = gtk-sharp-docs.source +docsdir = $(datadir)/doc/gtk-sharp/xml docs_DATA = $(TARGETS) else TARGETS = @@ -11,7 +11,8 @@ endif ASSEMBLER = $(MONODOC) --assemble UPDATER = $(MONODOC) --update -DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml +DIRS=glib pango atk gdk gtk glade art gnome gda gnomedb gconf/GConf gconf/GConf.PropertyEditors rsvg gtkhtml vte +NAMESPACES=GLib Pango Atk Gdk Gtk Glade Art Gnome Gda GnomeDb GConf GConf.PropertyEditors Rsvg Vte gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml $(ASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs @@ -62,3 +63,15 @@ dist-hook: cp $(srcdir)/en/GConf/*.xml $(distdir)/en/GConf/ mkdir -p $(distdir)/en/GConf.PropertyEditors cp $(srcdir)/en/GConf.PropertyEditors/*.xml $(distdir)/en/GConf.PropertyEditors/ + +install-data-local: + mkdir -p $(DESTDIR)$(docsdir)/en + cp $(srcdir)/en/*.xml $(DESTDIR)$(docsdir)/en; + for i in $(NAMESPACES); do \ + mkdir -p $(DESTDIR)$(docsdir)/en/$$i; \ + cp $(srcdir)/en/$$i/* $(DESTDIR)$(docsdir)/en/$$i; \ + done + +uninstall-local: + rm -rf $(DESTDIR)$(docsdir)/en + diff --git a/gconf/GConf.PropertyEditors/.cvsignore b/gconf/GConf.PropertyEditors/.cvsignore index c000e4ca7..3361b6488 100644 --- a/gconf/GConf.PropertyEditors/.cvsignore +++ b/gconf/GConf.PropertyEditors/.cvsignore @@ -2,4 +2,4 @@ Makefile Makefile.in AssemblyInfo.cs *.dll -gtk-sharp.pub +gtk-sharp.snk diff --git a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in b/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in +++ b/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am index 756bf3385..6a22813a8 100644 --- a/gconf/GConf.PropertyEditors/Makefile.am +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -7,7 +7,7 @@ endif ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gconf-sharp-peditors noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) gtk-sharp.snk DISTCLEANFILES = AssemblyInfo.cs EXTRA_DIST = \ @@ -32,21 +32,21 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) gtk-sharp.pub +$(ASSEMBLY): $(build_sources) gtk-sharp.snk $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gconf/GConf/.cvsignore b/gconf/GConf/.cvsignore index 858470914..52502d94b 100644 --- a/gconf/GConf/.cvsignore +++ b/gconf/GConf/.cvsignore @@ -4,4 +4,4 @@ Makefile Makefile.in *.dll *.dll.config -gtk-sharp.pub +gtk-sharp.snk diff --git a/gconf/GConf/AssemblyInfo.cs.in b/gconf/GConf/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gconf/GConf/AssemblyInfo.cs.in +++ b/gconf/GConf/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index e6d15ba13..fc84ddfcb 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -6,7 +6,7 @@ else TARGET = endif noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) gtk-sharp.snk DISTCLEANFILES = gconf-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs ASSEMBLY = $(ASSEMBLY_NAME).dll @@ -34,21 +34,21 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) gtk-sharp.pub +$(ASSEMBLY): $(build_sources) gtk-sharp.snk $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gda/.cvsignore b/gda/.cvsignore index 6e935335a..a0216b9e5 100755 --- a/gda/.cvsignore +++ b/gda/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gda/AssemblyInfo.cs.in b/gda/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gda/AssemblyInfo.cs.in +++ b/gda/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gda/Makefile.am b/gda/Makefile.am index 518b8f941..e3db95bc6 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -18,7 +18,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = gda-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -51,21 +51,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gdk/.cvsignore b/gdk/.cvsignore index 84dd7b415..59d84007e 100644 --- a/gdk/.cvsignore +++ b/gdk/.cvsignore @@ -6,5 +6,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gdk/AssemblyInfo.cs.in b/gdk/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gdk/AssemblyInfo.cs.in +++ b/gdk/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 7b123069f..003601ea9 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -13,7 +13,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -81,21 +81,21 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --gluelib-name=gdksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/glade/.cvsignore b/glade/.cvsignore index 9dac16d3e..d6145d00b 100755 --- a/glade/.cvsignore +++ b/glade/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/glade/AssemblyInfo.cs.in b/glade/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/glade/AssemblyInfo.cs.in +++ b/glade/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/glade/Makefile.am b/glade/Makefile.am index 13e2cd419..400a12545 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -21,7 +21,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = glade-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -57,21 +57,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/glib/.cvsignore b/glib/.cvsignore index 2cf86aa56..042fae25f 100755 --- a/glib/.cvsignore +++ b/glib/.cvsignore @@ -7,5 +7,5 @@ generated Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/glib/AssemblyInfo.cs.in b/glib/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/glib/AssemblyInfo.cs.in +++ b/glib/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/glib/Makefile.am b/glib/Makefile.am index 5f8ac2127..efa167797 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -4,7 +4,7 @@ TARGET = $(ASSEMBLY) ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = glib-sharp noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -CLEANFILES = $(ASSEMBLY) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs references = @@ -53,21 +53,21 @@ EXTRA_DIST = \ AssemblyInfo.cs.in \ makefile.win32 -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) gtk-sharp.pub +$(ASSEMBLY): $(build_sources) gtk-sharp.snk $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/glib/ObjectManager.cs b/glib/ObjectManager.cs index 550fd5a2d..dad107ce3 100644 --- a/glib/ObjectManager.cs +++ b/glib/ObjectManager.cs @@ -48,7 +48,7 @@ namespace GLib { try { obj = (GLib.Object) Activator.CreateInstance (t, new object[] {raw}); } catch (MissingMethodException) { - throw new GLib.MissingIntPtrCtorException ("All GLib.Object subclasses must provide a protected or public IntPtr ctor to support wrapping of native object handles."); + throw new GLib.MissingIntPtrCtorException ("GLib.Object subclass " + t + " must provide a protected or public IntPtr ctor to support wrapping of native object handles."); } return obj; } diff --git a/gnome/.cvsignore b/gnome/.cvsignore index afb74527a..5723fd4b4 100644 --- a/gnome/.cvsignore +++ b/gnome/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gnome/AssemblyInfo.cs.in b/gnome/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gnome/AssemblyInfo.cs.in +++ b/gnome/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gnome/Makefile.am b/gnome/Makefile.am index d02f9423e..821a5abd2 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -23,7 +23,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = gnome-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -87,21 +87,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gnomedb/.cvsignore b/gnomedb/.cvsignore index 295eee32f..c678b7efc 100755 --- a/gnomedb/.cvsignore +++ b/gnomedb/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gnomedb/AssemblyInfo.cs.in b/gnomedb/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gnomedb/AssemblyInfo.cs.in +++ b/gnomedb/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am index cdbed46d0..87a956880 100644 --- a/gnomedb/Makefile.am +++ b/gnomedb/Makefile.am @@ -18,7 +18,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = gnomedb-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -51,21 +51,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gtk/.cvsignore b/gtk/.cvsignore index 84dd7b415..59d84007e 100755 --- a/gtk/.cvsignore +++ b/gtk/.cvsignore @@ -6,5 +6,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gtk/AssemblyInfo.cs.in b/gtk/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gtk/AssemblyInfo.cs.in +++ b/gtk/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gtk/Makefile.am b/gtk/Makefile.am index a82f758c2..786c8e857 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -13,7 +13,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -112,21 +112,21 @@ generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.ex --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/gtkhtml/.cvsignore b/gtkhtml/.cvsignore index ac70b3571..2980ae778 100755 --- a/gtkhtml/.cvsignore +++ b/gtkhtml/.cvsignore @@ -7,4 +7,4 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/gtkhtml/AssemblyInfo.cs.in b/gtkhtml/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/gtkhtml/AssemblyInfo.cs.in +++ b/gtkhtml/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am index aab46e2c0..d959d18ee 100644 --- a/gtkhtml/Makefile.am +++ b/gtkhtml/Makefile.am @@ -18,7 +18,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = gtkhtml-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -52,21 +52,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/pango/.cvsignore b/pango/.cvsignore index 84dd7b415..59d84007e 100644 --- a/pango/.cvsignore +++ b/pango/.cvsignore @@ -6,5 +6,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/pango/AssemblyInfo.cs.in b/pango/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/pango/AssemblyInfo.cs.in +++ b/pango/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/pango/Makefile.am b/pango/Makefile.am index b956332ed..99200d326 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -11,7 +11,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs sources = \ @@ -49,21 +49,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/rsvg/.cvsignore b/rsvg/.cvsignore index 3195562af..3a84c4246 100755 --- a/rsvg/.cvsignore +++ b/rsvg/.cvsignore @@ -7,5 +7,5 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/rsvg/AssemblyInfo.cs.in b/rsvg/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/rsvg/AssemblyInfo.cs.in +++ b/rsvg/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am index 899ad44f7..c6986f940 100644 --- a/rsvg/Makefile.am +++ b/rsvg/Makefile.am @@ -19,7 +19,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = rsvg-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -52,21 +52,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi diff --git a/sample/GtkDemo/Makefile.am b/sample/GtkDemo/Makefile.am index a8a62cc12..837b4b293 100644 --- a/sample/GtkDemo/Makefile.am +++ b/sample/GtkDemo/Makefile.am @@ -28,5 +28,5 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) GtkDemo.exe: $(build_sources) $(assemblies) - $(CSC) -g /out:GtkDemo.exe $(build_sources) $(references) + $(CSC) /debug /out:GtkDemo.exe $(build_sources) $(references) diff --git a/sample/Makefile.am b/sample/Makefile.am index 8e2f8f741..849b98e26 100755 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -27,73 +27,73 @@ endif TARGETS = custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe treeviewdemo.exe managedtreeviewdemo.exe testdnd.exe drawing-sample.exe custom-widget.exe $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS) assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY) -references=$(addprefix -r , $(assemblies)) +references=$(addprefix /r:, $(assemblies)) noinst_SCRIPTS = $(TARGETS) CLEANFILES = $(TARGETS) gtk-hello-world.exe: $(srcdir)/HelloWorld.cs $(assemblies) - $(CSC) -out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs + $(CSC) /out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs gnome-hello-world.exe: $(srcdir)/GnomeHelloWorld.cs $(assemblies) - $(CSC) -out:gnome-hello-world.exe $(references) $(srcdir)/GnomeHelloWorld.cs + $(CSC) /out:gnome-hello-world.exe $(references) $(srcdir)/GnomeHelloWorld.cs canvas-example.exe: $(srcdir)/CanvasExample.cs $(assemblies) - $(CSC) -out:canvas-example.exe $(references) $(srcdir)/CanvasExample.cs + $(CSC) /out:canvas-example.exe $(references) $(srcdir)/CanvasExample.cs fifteen.exe: $(srcdir)/Fifteen.cs $(assemblies) - $(CSC) -out:fifteen.exe $(references) $(srcdir)/Fifteen.cs + $(CSC) /out:fifteen.exe $(references) $(srcdir)/Fifteen.cs print.exe: $(srcdir)/PrintSample.cs $(assemblies) - $(CSC) -out:print.exe $(references) $(srcdir)/PrintSample.cs + $(CSC) /out:print.exe $(references) $(srcdir)/PrintSample.cs button.exe: $(srcdir)/ButtonApp.cs $(assemblies) - $(CSC) -out:button.exe $(references) $(srcdir)/ButtonApp.cs + $(CSC) /out:button.exe $(references) $(srcdir)/ButtonApp.cs calendar.exe: $(srcdir)/CalendarApp.cs $(assemblies) - $(CSC) -out:calendar.exe $(references) $(srcdir)/CalendarApp.cs + $(CSC) /out:calendar.exe $(references) $(srcdir)/CalendarApp.cs subclass.exe: $(srcdir)/Subclass.cs $(assemblies) - $(CSC) -out:subclass.exe $(references) $(srcdir)/Subclass.cs + $(CSC) /out:subclass.exe $(references) $(srcdir)/Subclass.cs menu.exe: $(srcdir)/Menu.cs $(assemblies) - $(CSC) -out:menu.exe $(references) $(srcdir)/Menu.cs + $(CSC) /out:menu.exe $(references) $(srcdir)/Menu.cs size.exe: $(srcdir)/Size.cs $(assemblies) - $(CSC) -out:size.exe $(references) $(srcdir)/Size.cs + $(CSC) /out:size.exe $(references) $(srcdir)/Size.cs scribble.exe: $(srcdir)/Scribble.cs $(assemblies) - $(CSC) -out:scribble.exe $(references) $(srcdir)/Scribble.cs + $(CSC) /out:scribble.exe $(references) $(srcdir)/Scribble.cs treeviewdemo.exe: $(srcdir)/TreeViewDemo.cs $(assemblies) - $(CSC) -out:treeviewdemo.exe $(references) $(srcdir)/TreeViewDemo.cs + $(CSC) /out:treeviewdemo.exe $(references) $(srcdir)/TreeViewDemo.cs managedtreeviewdemo.exe: $(srcdir)/ManagedTreeViewDemo.cs $(assemblies) - $(CSC) -out:managedtreeviewdemo.exe $(references) $(srcdir)/ManagedTreeViewDemo.cs + $(CSC) /out:managedtreeviewdemo.exe $(references) $(srcdir)/ManagedTreeViewDemo.cs glade-viewer.exe: $(srcdir)/GladeViewer.cs $(assemblies) - $(CSC) -out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs + $(CSC) /out:glade-viewer.exe $(references) $(srcdir)/GladeViewer.cs glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies) - $(CSC) -resource:$(srcdir)/test.glade,test.glade -out:glade-test.exe $(references) $(srcdir)/GladeTest.cs + $(CSC) /resource:$(srcdir)/test.glade,test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies) - $(CSC) -out:cairo-sample.exe $(references) -r:Mono.Cairo $(srcdir)/CairoSample.cs + $(CSC) /out:cairo-sample.exe $(references) /r:Mono.Cairo $(srcdir)/CairoSample.cs testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies) - $(CSC) -debug+ --unsafe -out:testdnd.exe $(references) $(srcdir)/TestDnd.cs + $(CSC) /debug /unsafe /out:testdnd.exe $(references) $(srcdir)/TestDnd.cs vte-example.exe: $(srcdir)/VteTest.cs $(assemblies) - $(CSC) -debug+ --unsafe -out:vte-example.exe $(references) $(srcdir)/VteTest.cs + $(CSC) /debug /unsafe /out:vte-example.exe $(references) $(srcdir)/VteTest.cs custom-cellrenderer.exe: $(srcdir)/CustomCellRenderer.cs $(assemblies) - $(CSC) -debug+ -out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs + $(CSC) /debug /out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs drawing-sample.exe: $(srcdir)/DrawingSample.cs $(srcdir)/sysdraw.cs $(assemblies) - $(CSC) -debug+ -out:drawing-sample.exe $(references) $(srcdir)/DrawingSample.cs $(srcdir)/sysdraw.cs -r:System.Drawing + $(CSC) /debug /out:drawing-sample.exe $(references) $(srcdir)/DrawingSample.cs $(srcdir)/sysdraw.cs /r:System.Drawing custom-widget.exe: $(srcdir)/CustomWidget.cs $(assemblies) - $(CSC) -debug+ -out:custom-widget.exe $(references) $(srcdir)/CustomWidget.cs + $(CSC) /debug /out:custom-widget.exe $(references) $(srcdir)/CustomWidget.cs EXTRA_DIST = \ HelloWorld.cs \ diff --git a/sample/test/Makefile.am b/sample/test/Makefile.am index ebc492218..78a461a6e 100644 --- a/sample/test/Makefile.am +++ b/sample/test/Makefile.am @@ -26,5 +26,5 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) WidgetViewer.exe: $(build_sources) $(assemblies) - $(CSC) -o WidgetViewer.exe $(references) $(build_sources) + $(CSC) /out:WidgetViewer.exe $(references) $(build_sources) diff --git a/vte/.cvsignore b/vte/.cvsignore index 8e5a94b6d..8cb03aac5 100644 --- a/vte/.cvsignore +++ b/vte/.cvsignore @@ -7,4 +7,4 @@ generated-stamp Makefile Makefile.in *-api.xml -gtk-sharp.pub +gtk-sharp.snk diff --git a/vte/AssemblyInfo.cs.in b/vte/AssemblyInfo.cs.in index 5d7fb4668..727ae19f7 100644 --- a/vte/AssemblyInfo.cs.in +++ b/vte/AssemblyInfo.cs.in @@ -2,5 +2,5 @@ using System.Reflection; using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.pub")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/vte/Makefile.am b/vte/Makefile.am index d02533774..dc08af3e1 100644 --- a/vte/Makefile.am +++ b/vte/Makefile.am @@ -18,7 +18,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll gapidir = $(datadir)/gapi noinst_DATA = $(TARGET) gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.pub +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk DISTCLEANFILES = vte-sharp.pc $(ASSEMBLY).config AssemblyInfo.cs @@ -50,21 +50,21 @@ generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ && touch generated-stamp -gtk-sharp.pub: $(top_srcdir)/gtk-sharp.pub - cp $(top_srcdir)/gtk-sharp.pub . +gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk + cp $(top_srcdir)/gtk-sharp.snk . -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.pub +$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk $(CSC) /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs install-data-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f $(GACUTIL_FLAGS) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ - echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE) /root $(DESTDIR)$(libdir) || exit 1; \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ fi