From 8fd87b2e0acaadc2b212b02b304ca3b188d3af26 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Sun, 9 Jan 2005 00:26:45 +0000 Subject: [PATCH] 2005-01-08 Mike Kestner * configure.in : kill a ton of redundant stuff. * AssemblyInfo.cs.in : moved here, only need one. * Makefile.include : rules for building generated assemblies. * Makefile.am : removed gtk-sharp-2.0.pc handling. * */AssemblyInfo.cs.in : killed * */Makefile.am : refactored out a ton of rules to an include. * */*-pc.in : added Cflags entries pointing to the gapi files. * generator/CodeGenerator.cs : add -I: synonym --include. * gnomevfs/gnome-vfs-api.raw : remamed from gnomevfs-api.raw. * gtk/gtk-sharp-2.0.pc.in : moved here from top. * parser/gapi-fixup.cs : add --symbol arg to merge sym files. * sources/gtk-sharp-sources.xml : remamed gnome-vfs-api.raw. svn path=/trunk/gtk-sharp/; revision=38551 --- art/AssemblyInfo.cs.in => AssemblyInfo.cs.in | 0 ChangeLog | 15 ++++ Makefile.am | 7 +- Makefile.include | 59 ++++++++++++++++ art/Makefile.am | 69 +++---------------- art/art-sharp-2.0.pc.in | 2 + atk/AssemblyInfo.cs.in | 6 -- atk/Makefile.am | 58 ++-------------- configure.in | 21 +----- .../GConf.PropertyEditors/AssemblyInfo.cs.in | 6 -- gconf/GConf.PropertyEditors/Makefile.am | 4 +- gconf/GConf/AssemblyInfo.cs.in | 6 -- gconf/GConf/Makefile.am | 5 +- gda/AssemblyInfo.cs.in | 6 -- gda/Makefile.am | 61 ++-------------- gda/gda-sharp-2.0.pc.in | 2 + gdk/AssemblyInfo.cs.in | 6 -- gdk/Makefile.am | 61 ++-------------- generator/CodeGenerator.cs | 6 +- glade/AssemblyInfo.cs.in | 6 -- glade/Makefile.am | 66 ++---------------- glade/glade-sharp-2.0.pc.in | 2 + glib/AssemblyInfo.cs.in | 6 -- glib/Makefile.am | 5 +- gnome/AssemblyInfo.cs.in | 6 -- gnome/Makefile.am | 65 ++--------------- gnome/gnome-sharp-2.0.pc.in | 2 + gnomedb/AssemblyInfo.cs.in | 6 -- gnomedb/Makefile.am | 62 ++--------------- gnomedb/gnomedb-sharp-2.0.pc.in | 2 + gnomevfs/AssemblyInfo.cs.in | 6 -- gnomevfs/Makefile.am | 64 ++--------------- .../{gnomevfs-api.raw => gnome-vfs-api.raw} | 0 gnomevfs/gnome-vfs-sharp-2.0.pc.in | 2 + gtk/AssemblyInfo.cs.in | 6 -- gtk/Makefile.am | 67 +++--------------- .../gtk-sharp-2.0.pc.in | 2 + gtkhtml/AssemblyInfo.cs.in | 6 -- gtkhtml/Makefile.am | 63 ++--------------- gtkhtml/gtkhtml-sharp-2.0.pc.in | 2 + pango/AssemblyInfo.cs.in | 6 -- pango/Makefile.am | 58 ++-------------- parser/gapi-fixup.cs | 35 +++++++++- rsvg/AssemblyInfo.cs.in | 6 -- rsvg/Makefile.am | 63 ++--------------- rsvg/rsvg-sharp-2.0.pc.in | 2 + sources/gtk-sharp-sources.xml | 2 +- vte/AssemblyInfo.cs.in | 6 -- vte/Makefile.am | 63 ++--------------- vte/vte-sharp-2.0.pc.in | 2 + 50 files changed, 222 insertions(+), 867 deletions(-) rename art/AssemblyInfo.cs.in => AssemblyInfo.cs.in (100%) create mode 100644 Makefile.include delete mode 100644 atk/AssemblyInfo.cs.in delete mode 100644 gconf/GConf.PropertyEditors/AssemblyInfo.cs.in delete mode 100644 gconf/GConf/AssemblyInfo.cs.in delete mode 100644 gda/AssemblyInfo.cs.in delete mode 100644 gdk/AssemblyInfo.cs.in delete mode 100644 glade/AssemblyInfo.cs.in delete mode 100644 glib/AssemblyInfo.cs.in delete mode 100644 gnome/AssemblyInfo.cs.in delete mode 100644 gnomedb/AssemblyInfo.cs.in delete mode 100644 gnomevfs/AssemblyInfo.cs.in rename gnomevfs/{gnomevfs-api.raw => gnome-vfs-api.raw} (100%) delete mode 100644 gtk/AssemblyInfo.cs.in rename gtk-sharp-2.0.pc.in => gtk/gtk-sharp-2.0.pc.in (72%) delete mode 100644 gtkhtml/AssemblyInfo.cs.in delete mode 100644 pango/AssemblyInfo.cs.in delete mode 100644 rsvg/AssemblyInfo.cs.in delete mode 100644 vte/AssemblyInfo.cs.in diff --git a/art/AssemblyInfo.cs.in b/AssemblyInfo.cs.in similarity index 100% rename from art/AssemblyInfo.cs.in rename to AssemblyInfo.cs.in diff --git a/ChangeLog b/ChangeLog index e880ddfd2..af09580f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-01-08 Mike Kestner + + * configure.in : kill a ton of redundant stuff. + * AssemblyInfo.cs.in : moved here, only need one. + * Makefile.include : rules for building generated assemblies. + * Makefile.am : removed gtk-sharp-2.0.pc handling. + * */AssemblyInfo.cs.in : killed + * */Makefile.am : refactored out a ton of rules to an include. + * */*-pc.in : added Cflags entries pointing to the gapi files. + * generator/CodeGenerator.cs : add -I: synonym --include. + * gnomevfs/gnome-vfs-api.raw : remamed from gnomevfs-api.raw. + * gtk/gtk-sharp-2.0.pc.in : moved here from top. + * parser/gapi-fixup.cs : add --symbol arg to merge sym files. + * sources/gtk-sharp-sources.xml : remamed gnome-vfs-api.raw. + 2005-01-07 Mike Kestner * sample/Makefile.am : mdb cleanup. diff --git a/Makefile.am b/Makefile.am index 98135ffc2..d742ad58f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,13 @@ SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gda gnomedb gtkhtml gconf rsvg vte sample doc -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gtk-sharp-2.0.pc - EXTRA_DIST = \ - gtk-sharp-2.0.pc.in \ gtk-sharp.snk \ makefile.win32 \ + AssemblyInfo.cs.in \ ChangeLog \ HACKING \ README \ README.generator -DISTCLEANFILES = gtk-sharp-2.0.pc +#DISTCLEANFILES = AssemblyInfo.cs diff --git a/Makefile.include b/Makefile.include new file mode 100644 index 000000000..e76d1da6b --- /dev/null +++ b/Makefile.include @@ -0,0 +1,59 @@ +SNK = gtk-sharp.snk +API = $(pkg)-api.xml +RAW_API = $(pkg)-api.raw + +ASSEMBLY_NAME = $(pkg)-sharp +ASSEMBLY = $(ASSEMBLY_NAME).dll + +TARGET = $(addsuffix -sharp.dll, $(pkg)) $(addsuffix -sharp.dll.config, $(pkg)) +noinst_DATA = $(TARGET) +TARGET_API = $(addsuffix -api.xml, $(pkg)) +gapidir = $(datadir)/gapi-2.0 +gapi_DATA = $(TARGET_API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) +DISTCLEANFILES = $(ASSEMBLY).config + +EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(customs) $(sources) $(add_dist) + +build_symbols = $(addprefix --symbols=$(srcdir)/, $(SYMBOLS)) + +$(API): $(METADATA) $(RAW_API) $(SYMBOLS) + cp $(srcdir)/$(RAW_API) $(API) + chmod u+w $(API) + @if test -n '$(METADATA)'; then \ + echo "$(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols)"; \ + $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) $(build_symbols); \ + fi + +build_customs = $(addprefix $(srcdir)/, $(customs)) +api_includes = $(addprefix -I:, $(INCLUDE_API)) + +generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) + rm -f generated/* && \ + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ + $(api_includes) \ + --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + --gluelib-name=$(pkg)sharpglue --glue-filename=glue/generated.c \ + && touch generated-stamp + +$(SNK): $(top_srcdir)/$(SNK) + cp $(top_srcdir)/$(SNK) . + +build_sources = $(addprefix $(srcdir)/, $(sources)) ../AssemblyInfo.cs +build_references = $(addprefix /r:, $(references)) + +$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) + $(CSC) -nowarn:0612 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) $(GENERATED_SOURCES) + +install-data-local: + @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) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ + fi + diff --git a/art/Makefile.am b/art/Makefile.am index d3f8d3b43..bc37b27cb 100644 --- a/art/Makefile.am +++ b/art/Makefile.am @@ -1,74 +1,21 @@ if ENABLE_LIBART -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) $(ADDITIONAL_API) +pkg = art pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = art-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = art-api.xml -RAW_API = art-api.raw -ADDITIONAL_API = art-symbols.xml -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml + +SYMBOLS = art-symbols.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml METADATA = Art.metadata -ASSEMBLY_NAME = art-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -apidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -api_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = art-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll sources = -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -dist_sources = $(sources) - customs = -build_customs = $(addprefix $(srcdir)/, $(customs)) -dist_customs = $(customs) +add_dist = art-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ADDITIONAL_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(dist_customs) \ - $(dist_sources) \ - art-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/art/art-sharp-2.0.pc.in b/art/art-sharp-2.0.pc.in index 08ad44ca5..03aa5956f 100644 --- a/art/art-sharp-2.0.pc.in +++ b/art/art-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Art# Description: Art# - libart .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/art-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/art-sharp.dll diff --git a/atk/AssemblyInfo.cs.in b/atk/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/atk/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/atk/Makefile.am b/atk/Makefile.am index a2357a2b1..3422b882d 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -1,63 +1,13 @@ #SUBDIRS = . glue -API = atk-api.xml -RAW_API = atk-api.raw +pkg = atk METADATA = Atk.metadata -ASSEMBLY_NAME = atk-sharp -references = /r:../glib/glib-sharp.dll - -TARGET = $(ASSEMBLY) -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll sources = -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = -build_customs = $(addprefix $(srcdir)/, $(customs)) - -EXTRA_DIST = \ - makefile.win32 \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=atksharpglue --glue-filename=glue/generated.c \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +add_dist = makefile.win32 +include ../Makefile.include diff --git a/configure.in b/configure.in index b0dc9b150..8d3b7a208 100644 --- a/configure.in +++ b/configure.in @@ -204,6 +204,8 @@ AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") AC_SUBST(CFLAGS) AC_OUTPUT([ +AssemblyInfo.cs +Makefile sources/Makefile parser/Makefile parser/gapi-2.0.pc @@ -212,70 +214,55 @@ parser/gapi2-parser generator/Makefile generator/gapi2-codegen glib/Makefile -glib/AssemblyInfo.cs glib/glib-sharp.dll.config glib/glue/Makefile pango/Makefile -pango/AssemblyInfo.cs pango/pango-sharp.dll.config pango/glue/Makefile atk/Makefile -atk/AssemblyInfo.cs atk/atk-sharp.dll.config art/Makefile -art/AssemblyInfo.cs art/art-sharp.dll.config art/art-sharp-2.0.pc gdk/Makefile -gdk/AssemblyInfo.cs gdk/gdk-sharp.dll.config gdk/glue/Makefile gtk/Makefile -gtk/AssemblyInfo.cs +gtk/gtk-sharp-2.0.pc gtk/gtk-sharp.dll.config gtk/glue/Makefile glade/Makefile -glade/AssemblyInfo.cs glade/glade-sharp.dll.config glade/glade-sharp-2.0.pc glade/glue/Makefile gnome/Makefile -gnome/AssemblyInfo.cs gnome/gnome-sharp.dll.config gnome/gnome-sharp-2.0.pc gnome/glue/Makefile gnomevfs/Makefile -gnomevfs/AssemblyInfo.cs gnomevfs/gnome-vfs-sharp.dll.config gnomevfs/gnome-vfs-sharp-2.0.pc gda/Makefile -gda/AssemblyInfo.cs gda/gda-sharp.dll.config gda/gda-sharp-2.0.pc gnomedb/Makefile -gnomedb/AssemblyInfo.cs gnomedb/gnomedb-sharp.dll.config gnomedb/gnomedb-sharp-2.0.pc gconf/Makefile gconf/doc/Makefile gconf/GConf/Makefile -gconf/GConf/AssemblyInfo.cs gconf/GConf/gconf-sharp.dll.config gconf/GConf/gconf-sharp-2.0.pc gconf/GConf.PropertyEditors/Makefile -gconf/GConf.PropertyEditors/AssemblyInfo.cs gconf/tools/Makefile gconf/tools/gconfsharp2-schemagen gtkhtml/Makefile -gtkhtml/AssemblyInfo.cs gtkhtml/gtkhtml-sharp.dll.config gtkhtml/gtkhtml-sharp-2.0.pc rsvg/Makefile -rsvg/AssemblyInfo.cs rsvg/rsvg-sharp.dll.config rsvg/rsvg-sharp-2.0.pc vte/Makefile -vte/AssemblyInfo.cs vte/vte-sharp.dll.config vte/vte-sharp-2.0.pc doc/Makefile @@ -289,8 +276,6 @@ sample/rsvg/Makefile sample/test/Makefile sample/drawing-sample.exe.config sample/cairo-sample.exe.config -gtk-sharp-2.0.pc -Makefile ]) echo "---" diff --git a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in b/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gconf/GConf.PropertyEditors/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am index 9db391f04..08b36e419 100644 --- a/gconf/GConf.PropertyEditors/Makefile.am +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -8,10 +8,8 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gconf-sharp-peditors noinst_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) gtk-sharp.snk -DISTCLEANFILES = AssemblyInfo.cs EXTRA_DIST = \ - AssemblyInfo.cs.in \ PropertyEditorColorPicker.cs \ $(sources) @@ -30,7 +28,7 @@ sources = \ PropertyEditorToggleButton.cs \ EditorShell.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . diff --git a/gconf/GConf/AssemblyInfo.cs.in b/gconf/GConf/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gconf/GConf/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index 5a3cba1d6..893ccde94 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -7,7 +7,7 @@ TARGET = endif noinst_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) gtk-sharp.snk -DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gconf-sharp @@ -15,7 +15,6 @@ ASSEMBLY_NAME = gconf-sharp EXTRA_DIST = \ $(sources) \ $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ gconf-sharp-2.0.pc.in references = \ @@ -33,7 +32,7 @@ sources = \ NotifyWrapper.cs \ Value.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . diff --git a/gda/AssemblyInfo.cs.in b/gda/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gda/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gda/Makefile.am b/gda/Makefile.am index 5d0b5035c..34a41a797 100644 --- a/gda/Makefile.am +++ b/gda/Makefile.am @@ -1,71 +1,20 @@ if ENABLE_GDA -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) +pkg = gda pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gda-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = gda-api.xml -RAW_API = gda-api.raw METADATA = Gda.metadata -ASSEMBLY_NAME = gda-sharp -references = /r:../glib/glib-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = gda-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll sources = \ Application.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = gda-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - gda-sharp-2.0.pc.in - -$(API): $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gda/gda-sharp-2.0.pc.in b/gda/gda-sharp-2.0.pc.in index fbd42c70d..24c3680c6 100644 --- a/gda/gda-sharp-2.0.pc.in +++ b/gda/gda-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Gda# Description: Gda# - Gda .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/gda-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gda-sharp.dll diff --git a/gdk/AssemblyInfo.cs.in b/gdk/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gdk/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 607acf317..fabf39ca9 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,20 +1,10 @@ SUBDIRS = . glue -API = gdk-api.xml -RAW_API = gdk-api.raw -ADDITIONAL_API = gdk-symbols.xml +pkg = gdk +SYMBOLS = gdk-symbols.xml INCLUDE_API = ../pango/pango-api.xml METADATA = Gdk.metadata -ASSEMBLY_NAME = gdk-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll - -TARGET = $(ASSEMBLY) -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll sources = \ EventButton.cs \ @@ -38,8 +28,6 @@ sources = \ Size.cs \ TextProperty.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ Atom.custom \ Color.custom \ @@ -63,45 +51,6 @@ customs = \ WindowAttr.custom \ Window.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) - -EXTRA_DIST = \ - makefile.win32 \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(RAW_API) \ - $(ADDITIONAL_API) \ - $(METADATA) \ - $(customs) \ - $(sources) - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=gdksharpglue --glue-filename=glue/generated.c \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +add_dist = makefile.win32 +include ../Makefile.include diff --git a/generator/CodeGenerator.cs b/generator/CodeGenerator.cs index 27ab922e3..44ccd5314 100644 --- a/generator/CodeGenerator.cs +++ b/generator/CodeGenerator.cs @@ -45,12 +45,16 @@ namespace GtkSharp.Generation { SymbolTable table = SymbolTable.Table; ArrayList gens = new ArrayList (); foreach (string arg in args) { + string filename = arg; if (arg == "--generate") { generate = true; continue; } else if (arg == "--include") { generate = false; continue; + } else if (arg.StartsWith ("-I:")) { + generate = false; + filename = filename.Substring (3); } else if (arg.StartsWith ("--outdir=")) { generate = false; dir = arg.Substring (9); @@ -74,7 +78,7 @@ namespace GtkSharp.Generation { } Parser p = new Parser (); - IGeneratable[] curr_gens = p.Parse (arg); + IGeneratable[] curr_gens = p.Parse (filename); table.AddTypes (curr_gens); if (generate) gens.AddRange (curr_gens); diff --git a/glade/AssemblyInfo.cs.in b/glade/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/glade/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/glade/Makefile.am b/glade/Makefile.am index 98046d7f6..4243a88f7 100644 --- a/glade/Makefile.am +++ b/glade/Makefile.am @@ -1,77 +1,25 @@ SUBDIRS = glue if ENABLE_GLADE -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) $(ADDITIONAL_API) +pkg = glade pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glade-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = glade-api.xml -RAW_API = glade-api.raw -ADDITIONAL_API = -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml + +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml METADATA = Glade.metadata -ASSEMBLY_NAME = glade-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = glade-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll sources = \ HandlerNotFoundExeception.cs \ WidgetAttribute.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ XML.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = makefile.win32 glade-sharp-2.0.pc.in -EXTRA_DIST = \ - makefile.win32 \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(RAW_API) \ - $(METADATA) \ - $(customs) \ - $(sources) \ - glade-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/glade/glade-sharp-2.0.pc.in b/glade/glade-sharp-2.0.pc.in index 942570717..cf0e4fd0e 100644 --- a/glade/glade-sharp-2.0.pc.in +++ b/glade/glade-sharp-2.0.pc.in @@ -1,10 +1,12 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Glade# Description: Glade# - Glade .NET Binding Version: @VERSION@ Requires: gtk-sharp-2.0 +Cflags: -I:${gapidir}/glade-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glade-sharp.dll diff --git a/glib/AssemblyInfo.cs.in b/glib/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/glib/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/glib/Makefile.am b/glib/Makefile.am index 941d2c2ee..c2404ea34 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -5,7 +5,7 @@ ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = glib-sharp noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config CLEANFILES = $(ASSEMBLY) gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs +DISTCLEANFILES = $(ASSEMBLY).config references = @@ -49,13 +49,12 @@ sources = \ ValueArray.cs \ Value.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs +build_sources = $(addprefix $(srcdir)/, $(sources)) ../AssemblyInfo.cs dist_sources = $(sources) EXTRA_DIST = \ $(dist_sources) \ $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ makefile.win32 gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk diff --git a/gnome/AssemblyInfo.cs.in b/gnome/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gnome/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gnome/Makefile.am b/gnome/Makefile.am index dcb80d71c..3464e6a50 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -1,31 +1,16 @@ SUBDIRS = glue if ENABLE_GNOME -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) - +pkg = gnome pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-sharp-2.0.pc - else -TARGET = -APIS = +pkg = endif -API = gnome-api.xml -RAW_API = gnome-api.raw -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml ../art/art-api.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml METADATA = Gnome.metadata -ASSEMBLY_NAME = gnome-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = gnome-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll sources = \ BonoboUIVerb.cs \ @@ -34,8 +19,6 @@ sources = \ Modules.cs \ PanelAppletFactory.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ App.custom \ DateEdit.custom \ @@ -70,43 +53,7 @@ customs = \ Program.custom \ Scores.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = gnome-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - gnome-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gnome/gnome-sharp-2.0.pc.in b/gnome/gnome-sharp-2.0.pc.in index d42bb286a..45b5c987b 100644 --- a/gnome/gnome-sharp-2.0.pc.in +++ b/gnome/gnome-sharp-2.0.pc.in @@ -1,10 +1,12 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Gnome# Description: Gnome# - GNOME .NET Binding Version: @VERSION@ Requires: gtk-sharp-2.0 art-sharp-2.0 +Cflags: -I:${gapidir}/gnome-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-sharp.dll diff --git a/gnomedb/AssemblyInfo.cs.in b/gnomedb/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gnomedb/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gnomedb/Makefile.am b/gnomedb/Makefile.am index 5a3fb6642..d9175eb81 100644 --- a/gnomedb/Makefile.am +++ b/gnomedb/Makefile.am @@ -1,71 +1,21 @@ if ENABLE_GNOMEDB -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) +pkg = gnomedb pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnomedb-sharp-2.0.pc else -TARGET = +pkg = APIS = endif -API = gnomedb-api.xml -RAW_API = gnomedb-api.raw -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml ../art/art-api.xml ../gnome/gnome-api.xml ../gda/gda-api.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml ../gnome/gnome-api.xml ../gda/gda-api.xml METADATA = GnomeDb.metadata -ASSEMBLY_NAME = gnomedb-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll /r:../gda/gda-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = gnomedb-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll ../gnome/gnome-sharp.dll ../gda/gda-sharp.dll sources = \ Application.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = gnomedb-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - gnomedb-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gnomedb/gnomedb-sharp-2.0.pc.in b/gnomedb/gnomedb-sharp-2.0.pc.in index 8dbff27c4..ce519b767 100644 --- a/gnomedb/gnomedb-sharp-2.0.pc.in +++ b/gnomedb/gnomedb-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: GnomeDB# Description: GnomeDB# - GNOMEDB .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/gnomedb-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnomedb-sharp.dll diff --git a/gnomevfs/AssemblyInfo.cs.in b/gnomevfs/AssemblyInfo.cs.in deleted file mode 100644 index 427e3925d..000000000 --- a/gnomevfs/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(true)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gnomevfs/Makefile.am b/gnomevfs/Makefile.am index 67d285fb0..9d16770b2 100644 --- a/gnomevfs/Makefile.am +++ b/gnomevfs/Makefile.am @@ -1,29 +1,16 @@ SUBDIRS = . if ENABLE_GNOMEVFS -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) $(ADDITIONAL_API) +pkg = gnome-vfs pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-vfs-sharp-2.0.pc else -TARGET= -APIS= +pkg= endif -API = gnomevfs-api.xml -ADDITIONAL_API = gnomevfs-symbols.xml -RAW_API = gnomevfs-api.raw -INCLUDE_API = +SYMBOLS = gnomevfs-symbols.xml METADATA = Gnomevfs.metadata -ASSEMBLY_NAME = gnome-vfs-sharp -references = /r:../glib/glib-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs gnome-vfs-sharp.pc +references = ../glib/glib-sharp.dll sources = \ Async.cs \ @@ -55,50 +42,11 @@ sources = \ XferProgressCallback.cs \ XferProgressCallbackNative.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ Uri.custom \ VolumeMonitor.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = gnome-vfs-sharp-2.0.pc.in -EXTRA_DIST = \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(RAW_API) \ - $(ADDITIONAL_API) \ - $(METADATA) \ - $(customs) \ - $(sources) - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gnomevfs/gnomevfs-api.raw b/gnomevfs/gnome-vfs-api.raw similarity index 100% rename from gnomevfs/gnomevfs-api.raw rename to gnomevfs/gnome-vfs-api.raw diff --git a/gnomevfs/gnome-vfs-sharp-2.0.pc.in b/gnomevfs/gnome-vfs-sharp-2.0.pc.in index ac3794336..dc1891a68 100644 --- a/gnomevfs/gnome-vfs-sharp-2.0.pc.in +++ b/gnomevfs/gnome-vfs-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: GnomeVfs# Description: GnomeVfs# - GNOME-VFS .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/gnome-vfs-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-vfs-sharp.dll diff --git a/gtk/AssemblyInfo.cs.in b/gtk/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gtk/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gtk/Makefile.am b/gtk/Makefile.am index cad0e1df5..87bc1543c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,20 +1,13 @@ SUBDIRS = . glue -API = gtk-api.xml -RAW_API = gtk-api.raw -ADDITIONAL_API = gtk-symbols.xml -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml -METADATA = Gtk.metadata -ASSEMBLY_NAME = gtk-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll +pkg = gtk +pkgconfigdir=$(libdir)/pkgconfig +pkgconfig_DATA=gtk-sharp-2.0.pc -TARGET = $(ASSEMBLY) -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -gapi_DATA = $(API) $(ADDITIONAL_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs +SYMBOLS = gtk-symbols.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml +METADATA = Gtk.metadata +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll sources = \ ActionEntry.cs \ @@ -33,8 +26,6 @@ sources = \ TreeNode.cs \ TreeNodeValueAttribute.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ Accel.custom \ AccelKey.custom \ @@ -107,52 +98,14 @@ customs = \ TreeStore.custom \ TreeViewColumn.custom \ TreeView.custom \ - UIManager.custom \ + UIManager.custom \ VBox.custom \ VScale.custom \ Viewport.custom \ Widget.custom \ Window.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = makefile.win32 gtk-sharp-2.0.pc.in -EXTRA_DIST = \ - makefile.win32 \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(RAW_API) \ - $(ADDITIONAL_API) \ - $(METADATA) \ - $(customs) \ - $(sources) - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) $(srcdir)/$(ADDITIONAL_API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - --gluelib-name=gtksharpglue --glue-filename=glue/generated.c \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gtk-sharp-2.0.pc.in b/gtk/gtk-sharp-2.0.pc.in similarity index 72% rename from gtk-sharp-2.0.pc.in rename to gtk/gtk-sharp-2.0.pc.in index a61ee08d5..e6e008203 100644 --- a/gtk-sharp-2.0.pc.in +++ b/gtk/gtk-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Gtk# Description: Gtk# - GNOME .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/pango-api.xml -I:${gapidir}/atk-api.xml -I:${gapidir}/gdk-api.xml -I:${gapidir}/gtk-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/glib-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/pango-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/atk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gdk-sharp.dll -r:${libdir}/mono/@PACKAGE_VERSION@/gtk-sharp.dll diff --git a/gtkhtml/AssemblyInfo.cs.in b/gtkhtml/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/gtkhtml/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am index f86551255..a5d9111ad 100644 --- a/gtkhtml/Makefile.am +++ b/gtkhtml/Makefile.am @@ -1,72 +1,21 @@ if ENABLE_GTKHTML -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) +pkg = gtkhtml pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gtkhtml-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = gtkhtml-api.xml -RAW_API = gtkhtml-api.raw -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml ../art/art-api.xml ../gnome/gnome-api.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml ../gnome/gnome-api.xml METADATA = Gtk.metadata -ASSEMBLY_NAME = gtkhtml-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll /r:../gnome/gnome-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = gtkhtml-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll ../gnome/gnome-sharp.dll sources = -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = \ HTML.custom \ HTMLStream.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = gtkhtml-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - gtkhtml-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/gtkhtml/gtkhtml-sharp-2.0.pc.in b/gtkhtml/gtkhtml-sharp-2.0.pc.in index 6f9bf661a..dc9e231db 100644 --- a/gtkhtml/gtkhtml-sharp-2.0.pc.in +++ b/gtkhtml/gtkhtml-sharp-2.0.pc.in @@ -1,10 +1,12 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Gtkhtml# Description: Gtkhtml# - Gtkhtml .NET Binding Version: @VERSION@ Requires: gnome-sharp-2.0 +Cflags: -I:${gapidir}/gtkhtml-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gtkhtml-sharp.dll diff --git a/pango/AssemblyInfo.cs.in b/pango/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/pango/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/pango/Makefile.am b/pango/Makefile.am index ead24c4d9..7ee728b2d 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -1,25 +1,12 @@ SUBDIRS = . glue -API = pango-api.xml -RAW_API = pango-api.raw +pkg = pango METADATA = Pango.metadata -ASSEMBLY_NAME = pango-sharp -references = /r:../glib/glib-sharp.dll - -TARGET = $(ASSEMBLY) -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -gapi_DATA = $(API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk -DISTCLEANFILES = $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll sources = \ Scale.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs -dist_sources = $(sources) - customs = \ AttrIterator.custom \ Context.custom \ @@ -32,44 +19,7 @@ customs = \ LayoutLine.custom \ TabArray.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) -dist_customs = $(customs) +add_dist = makefile.win32 -EXTRA_DIST = \ - makefile.win32 \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(RAW_API) \ - $(METADATA) \ - $(dist_customs) \ - $(dist_sources) - -$(API): $(srcdir)/$(METADATA) $(srcdir)/$(RAW_API) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/parser/gapi-fixup.cs b/parser/gapi-fixup.cs index 12a49e1eb..d426c9886 100644 --- a/parser/gapi-fixup.cs +++ b/parser/gapi-fixup.cs @@ -29,14 +29,15 @@ namespace GtkSharp.Parsing { public static int Main (string[] args) { - if (args.Length != 2) { - Console.WriteLine ("Usage: gapi-fixup --metadata= --api="); + if (args.Length < 2) { + Console.WriteLine ("Usage: gapi-fixup --metadata= --api= --symbols="); return 0; } string api_filename = ""; XmlDocument api_doc = new XmlDocument (); XmlDocument meta_doc = new XmlDocument (); + XmlDocument symbol_doc = new XmlDocument (); foreach (string arg in args) { @@ -68,6 +69,20 @@ namespace GtkSharp.Parsing { return 1; } + } else if (arg.StartsWith ("--symbols=")) { + + string symbol_filename = arg.Substring (10); + + try { + Stream stream = File.OpenRead (symbol_filename); + symbol_doc.Load (stream); + stream.Close (); + } catch (XmlException e) { + Console.WriteLine ("Invalid api file."); + Console.WriteLine (e); + return 1; + } + } else { Console.WriteLine ("Usage: gapi-fixup --metadata= --api="); return 1; @@ -116,6 +131,22 @@ namespace GtkSharp.Parsing { } } + if (symbol_doc != null) { + Console.WriteLine ("adding symbols to api file"); + XPathNavigator symbol_nav = symbol_doc.CreateNavigator (); + XPathNodeIterator iter = symbol_nav.Select ("/api/*"); + while (iter.MoveNext ()) { + Console.WriteLine ("adding symbol"); + XmlNode sym_node = ((IHasXmlNode)iter.Current).GetNode (); + XPathNodeIterator parent_iter = api_nav.Select ("/api"); + if (parent_iter.MoveNext ()) { + Console.WriteLine ("to parent node"); + XmlNode parent_node = ((IHasXmlNode)parent_iter.Current).GetNode (); + parent_node.AppendChild (api_doc.ImportNode (sym_node, true)); + } + } + } + api_doc.Save (api_filename); return 0; } diff --git a/rsvg/AssemblyInfo.cs.in b/rsvg/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/rsvg/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/rsvg/Makefile.am b/rsvg/Makefile.am index 6196c1e73..2b0c18288 100644 --- a/rsvg/Makefile.am +++ b/rsvg/Makefile.am @@ -1,72 +1,21 @@ if ENABLE_RSVG -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) +pkg = rsvg pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = rsvg-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = rsvg-api.xml -RAW_API = rsvg-api.raw -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml ../art/art-api.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml METADATA = Rsvg.metadata -ASSEMBLY_NAME = rsvg-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll /r:../art/art-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = rsvg-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll sources = \ Tool.cs -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = Pixbuf.custom -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = rsvg-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - rsvg-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/rsvg/rsvg-sharp-2.0.pc.in b/rsvg/rsvg-sharp-2.0.pc.in index 8e6ac4aba..d69d9ba89 100644 --- a/rsvg/rsvg-sharp-2.0.pc.in +++ b/rsvg/rsvg-sharp-2.0.pc.in @@ -1,9 +1,11 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Rsvg# Description: Rsvg# - librsvg .NET Binding Version: @VERSION@ +Cflags: -I:${gapidir}/rsvg-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/rsvg-sharp.dll diff --git a/sources/gtk-sharp-sources.xml b/sources/gtk-sharp-sources.xml index 2616a15c9..05d477b6b 100644 --- a/sources/gtk-sharp-sources.xml +++ b/sources/gtk-sharp-sources.xml @@ -108,7 +108,7 @@ - + gnome-vfs-2.6.0/libgnomevfs diff --git a/vte/AssemblyInfo.cs.in b/vte/AssemblyInfo.cs.in deleted file mode 100644 index 727ae19f7..000000000 --- a/vte/AssemblyInfo.cs.in +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly:AssemblyVersion("@API_VERSION@")] -[assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("gtk-sharp.snk")] diff --git a/vte/Makefile.am b/vte/Makefile.am index 9184dbe8e..94ffc2073 100644 --- a/vte/Makefile.am +++ b/vte/Makefile.am @@ -1,70 +1,19 @@ if ENABLE_VTE -TARGET = $(ASSEMBLY) $(ASSEMBLY).config -APIS = $(API) +pkg = vte pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = vte-sharp-2.0.pc else -TARGET = -APIS = +pkg = endif -API = vte-api.xml -RAW_API = vte-api.raw -INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml $(top_srcdir)/gdk/gdk-symbols.xml ../gtk/gtk-api.xml $(top_srcdir)/gtk/gtk-symbols.xml +INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml METADATA = Vte.metadata -ASSEMBLY_NAME = vte-sharp -references = /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gtk/gtk-sharp.dll - -ASSEMBLY = $(ASSEMBLY_NAME).dll -gapidir = $(datadir)/gapi-2.0 -noinst_DATA = $(TARGET) -gapi_DATA = $(APIS) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) gtk-sharp.snk - -DISTCLEANFILES = vte-sharp-2.0.pc $(ASSEMBLY).config AssemblyInfo.cs +references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll sources = -build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs - customs = -build_customs = $(addprefix $(srcdir)/, $(customs)) +add_dist = vte-sharp-2.0.pc.in -EXTRA_DIST = \ - $(RAW_API) \ - $(ASSEMBLY).config.in \ - AssemblyInfo.cs.in \ - $(METADATA) \ - $(customs) \ - $(sources) \ - vte-sharp-2.0.pc.in - -$(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) - cp $(srcdir)/$(RAW_API) $(API) - chmod u+w $(API) - $(RUNTIME) ../parser/gapi-fixup.exe --api=$(API) --metadata=$(srcdir)/$(METADATA) - -generated-stamp: $(API) ../generator/gapi_codegen.exe $(build_customs) - rm -f generated/* && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ - --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ - && touch generated-stamp - -gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk - cp $(top_srcdir)/gtk-sharp.snk . - -$(ASSEMBLY): $(build_sources) generated-stamp gtk-sharp.snk - $(CSC) /nowarn:0612 /unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) $(GENERATED_SOURCES) - -install-data-local: - @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) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; \ - fi +include ../Makefile.include diff --git a/vte/vte-sharp-2.0.pc.in b/vte/vte-sharp-2.0.pc.in index d7e4777f0..9e17eb767 100644 --- a/vte/vte-sharp-2.0.pc.in +++ b/vte/vte-sharp-2.0.pc.in @@ -1,10 +1,12 @@ prefix=@prefix@ exec_prefix=${prefix} libdir=${exec_prefix}/lib +gapidir=${prefix}/share/gapi-2.0 Name: Vte# Description: Vte# - libvte .NET Binding Version: @VERSION@ Requires: gnome-sharp-2.0 +Cflags: -I:${gapidir}/vte-api.xml Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/vte-sharp.dll