diff --git a/ChangeLog b/ChangeLog index d21739cb5..4aa5a5b5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-08-15 Duncan Mak + + * generator/gtkapi.xml: New Libart stuff. + + * parser/build.pl: + * gnome/Makefile.in: Added reference to atk-sharp.dll + + * generator/Parameters.cs (MangleName): Added cases for 'in' and 'out'. + 2002-08-13 Joe Shaw * configure.in: Check for libgnomecanvas. diff --git a/art/Makefile.in b/art/Makefile.in new file mode 100755 index 000000000..7b6e6f274 --- /dev/null +++ b/art/Makefile.in @@ -0,0 +1,20 @@ +MCS=mcs +DESTDIR= + +all: linux + +windows: + $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /r:../gdk/gdk-imaging-sharp.dll /out:art-sharp.dll /recurse:*.cs + +linux: art-sharp.dll + +art-sharp.dll: generated/*.cs + $(MCS) --unsafe --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -o art-sharp.dll --recurse '*.cs' + +clean: + rm -f *.dll + rm -f generated/* + +install: all + cp art-sharp.dll $(DESTDIR)@prefix@/lib + diff --git a/configure.in b/configure.in index 308067c09..f1b44d84d 100644 --- a/configure.in +++ b/configure.in @@ -87,6 +87,7 @@ glue/Makefile glib/Makefile pango/Makefile atk/Makefile +art/Makefile gdk/Makefile gtk/Makefile glade/Makefile diff --git a/generator/Parameters.cs b/generator/Parameters.cs index 0f49e1102..e1de7a393 100644 --- a/generator/Parameters.cs +++ b/generator/Parameters.cs @@ -394,6 +394,10 @@ namespace GtkSharp.Generation { return "evnt"; case "object": return "objekt"; + case "in": + return "in_param"; + case "out": + return "out_param"; default: break; } diff --git a/generator/gtkapi.xml b/generator/gtkapi.xml index 2d1a68632..639889a6e 100644 --- a/generator/gtkapi.xml +++ b/generator/gtkapi.xml @@ -1,5 +1,749 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -18548,8 +19292,6 @@ - - diff --git a/gnome/Makefile.in b/gnome/Makefile.in index a7f119737..a283088bd 100755 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -10,7 +10,7 @@ windows: linux: gnome-sharp.dll gnome-sharp.dll: generated/*.cs - $(MCS) --unsafe --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o gnome-sharp.dll --recurse '*.cs' + $(MCS) --unsafe --target library -r System.Drawing -L ../glib -L ../pango -L ../atk -L ../art -L ../gdk -L ../gtk -r glib-sharp.dll -r pango-sharp.dll -r atk-sharp.dll -r art-sharp.dll -r gdk-sharp.dll -r gtk-sharp.dll -o gnome-sharp.dll --recurse '*.cs' clean: rm -f *.dll diff --git a/makefile b/makefile index 6be9b1507..adf14b81b 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,6 @@ EXTRA_DIRS = -DIRS=generator glib pango atk gdk gtk glade gnome sample +DIRS=generator glib pango atk art gdk gtk glade gnome sample ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe MCS=mcs diff --git a/parser/README b/parser/README index c55d32c56..7d9d0d2ee 100644 --- a/parser/README +++ b/parser/README @@ -13,4 +13,4 @@ libgnomeui-2.0.1 gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h, gtkhtml-enums.h, gtkhtml-stream.[ch] libglade-2.0.0 - +libart_lgpl-2.3.10 diff --git a/parser/build.pl b/parser/build.pl index a2ec7e5b2..1611ebb82 100755 --- a/parser/build.pl +++ b/parser/build.pl @@ -13,7 +13,8 @@ unlink ($file); "libgnomecanvas-2.0.1/libgnomecanvas" => "Gnome:gnomecanvas-2", "libgnomeui-2.0.1/libgnomeui" => "Gnome:gnomeui-2", "gtkhtml/src" => "Gtk:gtkhtml-3.0", - "libglade-2.0.0/glade" => "Glade:glade-2.0"); + "libglade-2.0.0/glade" => "Glade:glade-2.0", + "libart_lgpl-2.3.10" => "Art:art_lgpl"); foreach $dir (keys %srcs) { ($ns, $lib) = split (/:/, $srcs{$dir}); diff --git a/sources/README b/sources/README index c55d32c56..7d9d0d2ee 100644 --- a/sources/README +++ b/sources/README @@ -13,4 +13,4 @@ libgnomeui-2.0.1 gtkhtml: cvs branch gnome-2-port files gtkhtml.[ch], gtkhtml-types.h, gtkhtml-enums.h, gtkhtml-stream.[ch] libglade-2.0.0 - +libart_lgpl-2.3.10