diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..aa432a9f0 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Mike Kestner diff --git a/ChangeLog b/ChangeLog index b73aa0d21..1483e2c94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-03-12 Mike Kestner + + * */Makefile.am : automakify the build + * */Makefile.in : kill + * *.custom : remove System.Drawing dependencies + * *.cs : remove System.Drawing dependencies + * *-api.xml : mv to *-api.raw + * glue/* : mv to lib specific gluelibs for glib, gdk, gtk, and glade. + * gtk/gtk-symbols : alias GtkType to GType + * sources/gtk-sharp-sources.xml : create .raw files. They are now + transformed to .xml files by the metadata compilation step. + 2004-03-08 Mike Kestner * generator/ObjectGen.cs : ignore virtual_method elems for now. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..0808583b8 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,14 @@ +SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnome gda gnomedb gtkhtml gconf rsvg vte sample + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gtk-sharp.pc + +EXTRA_DIST = \ + gtk-sharp.pc.in \ + makefile.win32 \ + ChangeLog \ + README \ + README.generator + +DISTCLEANFILES = gtk-sharp.pc + diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index aeaee3314..000000000 --- a/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -NATIVE_DIRS = glue parser - -DIRS=generator glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg vte sample -ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) -CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe -MCS=mcs - -all: linux - -windows: - for i in $(DIRS); do \ - CSC=$(CSC) $(MAKE) -C $$i windows || exit 1; \ - done; - -unix: - @echo "'make unix' is broken for now." - -linux: native binding - -binding: - for i in $(DIRS); do \ - MCS="$(MCS)" $(MAKE) -C $$i || exit 1;\ - done; - -native: - for i in $(NATIVE_DIRS); do \ - $(MAKE) -C $$i || exit 1; \ - done - -clean: - for i in $(NATIVE_DIRS) $(DIRS); do \ - $(MAKE) -C $$i clean || exit 1; \ - done; - -gen-clean: - for i in $(DIRS); do \ - $(MAKE) -C $$i clean || exit 1; \ - done; - -distclean: clean - for i in $(NATIVE_DIRS); do \ - $(MAKE) -C $$i distclean || exit 1; \ - done - for i in $(DIRS); do \ - $(MAKE) -C $$i distclean || true; \ - rm -f $$i/Makefile; \ - done - rm -f config.cache config.h config.log config.status libtool - rm -f gtk-sharp.pc - rm -f Makefile - -maintainer-clean: distclean - rm -f aclocal.m4 config.guess config.h.in config.sub - rm -f configure install-sh ltmain.sh missing - rm -f mkinstalldirs stamp-h glue/Makefile.in - -install: install-native install-binding install-pkgconfig - -install-binding: - for i in $(DIRS); do \ - $(MAKE) -C $$i install || exit 1; \ - done - -install-native: - for i in $(NATIVE_DIRS); do \ - $(MAKE) -C $$i install || exit 1; \ - done - -install-pkgconfig: - ./mkinstalldirs $(DESTDIR)@prefix@/lib/pkgconfig - cp gtk-sharp.pc $(DESTDIR)@prefix@/lib/pkgconfig diff --git a/NEWS b/NEWS new file mode 100644 index 000000000..867bafc57 --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ +try CNN diff --git a/art/Makefile.am b/art/Makefile.am new file mode 100644 index 000000000..f89c3d44f --- /dev/null +++ b/art/Makefile.am @@ -0,0 +1,52 @@ +if ENABLE_LIBART +TARGET = $(ASSEMBLY) +APIS = $(API) $(ADDITIONAL_API) +else +TARGET = +APIS = +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 +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 +assemblydir = $(libdir) +apidir = $(datadir)/gapi +assembly_DATA = $(TARGET) +api_DATA = $(APIS) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) + +sources = + +build_sources = $(addprefix $(srcdir)/, $(sources)) +dist_sources = $(sources) + +customs = + +build_customs = $(addprefix $(srcdir)/, $(customs)) +dist_customs = $(customs) + +EXTRA_DIST = \ + $(RAW_API) \ + $(ADDITIONAL_API) \ + $(METADATA) \ + $(dist_customs) \ + $(dist_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) + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) $(srcdir)/$(ADDITIONAL_API) \ + --include $(INCLUDE_API) --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + && touch generated-stamp + +$(ASSEMBLY): $(build_sources) generated-stamp + $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs + diff --git a/art/Makefile.in b/art/Makefile.in deleted file mode 100755 index 5995bb054..000000000 --- a/art/Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ -APIS=art-api.xml art-symbols.xml - -INCLUDE_APIS = ../atk/atk-api.xml \ - ../pango/pango-api.xml \ - ../gdk/gdk-api.xml \ - ../gdk/gdk-symbols.xml - -RUNTIME=@MONO@ -MCS=mcs -ASSEMBLY=art-sharp.dll - -all: $(ASSEMBLY) - -generated-stamp: $(APIS) ../generator/gapi_codegen.exe Art.metadata - $(RUNTIME) ../parser/gapi-fixup.exe --api=art-api.xml --metadata=Art.metadata && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ - --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ - --assembly-name=art-sharp && touch generated-stamp - -$(ASSEMBLY): generated-stamp - $(MCS) --unsafe --target library \ - -r System.Drawing -r ../glib/glib-sharp.dll \ - -r ../pango/pango-sharp.dll -r ../atk/atk-sharp.dll \ - -r ../gdk/gdk-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - -prefix=@prefix@ -DESTDIR= -apidir=$(DESTDIR)$(prefix)/share/gapi -libdir=$(DESTDIR)$(prefix)/lib - -install: all - ../mkinstalldirs $(libdir) && \ - ../mkinstalldirs $(apidir) && \ - for i in $(APIS); do \ - cp $$i $(apidir) || true; \ - done && \ - cp $(ASSEMBLY) $(libdir) diff --git a/art/art-api.raw b/art/art-api.raw new file mode 100644 index 000000000..bef4873df --- /dev/null +++ b/art/art-api.raw @@ -0,0 +1,1069 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/art/art-api.xml b/art/art-api.xml deleted file mode 100644 index df8eb80e8..000000000 --- a/art/art-api.xml +++ /dev/null @@ -1,1068 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/atk/Makefile.am b/atk/Makefile.am new file mode 100644 index 000000000..f63c42d8f --- /dev/null +++ b/atk/Makefile.am @@ -0,0 +1,41 @@ +API = atk-api.xml +RAW_API = atk-api.raw +METADATA = Atk.metadata +ASSEMBLY_NAME = atk-sharp +references = /r:../glib/glib-sharp.dll + +ASSEMBLY = $(ASSEMBLY_NAME).dll +assemblydir = $(libdir) +gapidir = $(datadir)/gapi +assembly_DATA = $(ASSEMBLY) +gapi_DATA = $(API) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) + +sources = + +build_sources = $(addprefix $(srcdir)/, $(sources)) + +customs = + +build_customs = $(addprefix $(srcdir)/, $(customs)) + +EXTRA_DIST = \ + makefile.win32 \ + $(RAW_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) ../generator/gapi_codegen.exe $(build_customs) + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ + --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + && touch generated-stamp + +$(ASSEMBLY): $(build_sources) generated-stamp + $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs + diff --git a/atk/Makefile.in b/atk/Makefile.in deleted file mode 100644 index 0b2c3112b..000000000 --- a/atk/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -APIS= atk-api.xml - -INCLUDE_APIS = ../pango/pango-api.xml - -RUNTIME=@MONO@ -MCS=mcs -ASSEMBLY=atk-sharp.dll - -all: $(ASSEMBLY) - -generated-stamp: $(APIS) ../generator/gapi_codegen.exe Atk.metadata - $(RUNTIME) ../parser/gapi-fixup.exe --api=atk-api.xml --metadata=Atk.metadata && \ - $(RUNTIME) ../generator/gapi_codegen.exe --generate $(APIS) \ - --include $(INCLUDE_APIS) --outdir=generated --customdir=. \ - --assembly-name=atk-sharp && touch generated-stamp - -$(ASSEMBLY): generated-stamp - $(MCS) --unsafe --target library \ - -r ../glib/glib-sharp.dll -r ../pango/pango-sharp.dll \ - -o $(ASSEMBLY) --recurse '*.cs' - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - -prefix=@prefix@ -DESTDIR= -apidir=$(DESTDIR)$(prefix)/share/gapi -libdir=$(DESTDIR)$(prefix)/lib - -install: all - ../mkinstalldirs $(libdir) && \ - ../mkinstalldirs $(apidir) && \ - for i in $(APIS); do \ - cp $$i $(apidir) || true; \ - done && \ - cp $(ASSEMBLY) $(libdir) diff --git a/atk/atk-api.xml b/atk/atk-api.raw similarity index 52% rename from atk/atk-api.xml rename to atk/atk-api.raw index 92ec9d072..faf93b45f 100644 --- a/atk/atk-api.xml +++ b/atk/atk-api.raw @@ -1,5 +1,6 @@ - - - + + - + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - + - + - + - + - - + + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - - + + + - + - - - - - + + + + + - + - + - + - - - + + + - + - - + + - + - + - + - - - + + + - + - + - + - - - - - + + + + + - + - - - + + + - + - - + + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - + - - - + + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - - + + + - + - - + + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - - - - - + + + + + + - + - + - + - - - + + + - + - - - + + + - + - - - + + + - + - - + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - + - + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - + + - + - - + + - + - - - + + + - + - + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + - - - + + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - - + + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - + - - - - + - - - - - - - + + + + + + + - - - + + + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - \ No newline at end of file + diff --git a/atk/makefile.win32 b/atk/makefile.win32 index a557afbac..7e2945ad7 100644 --- a/atk/makefile.win32 +++ b/atk/makefile.win32 @@ -10,8 +10,14 @@ windows: generated-stamp generated-stamp: ../generator/codegen.exe atk-api.xml ../generator/codegen --generate $(APIS) --outdir=generated --customdir=. --assembly-name=atk-sharp && touch generated-stamp +atk-api.xml: atk-api.raw Atk.metadata + cp atk-api.raw atk-api.xml + chmod u+w atk-api.xml + ../parser/gapi-fixup.exe --api=atk-api.xml --metadata=Atk.metadata + clean: rm -f generated-stamp rm -f $(ASSEMBLY) rm -rf generated + rm -f atk-api.xml diff --git a/configure.in b/configure.in index 0a7557340..341e67d7f 100644 --- a/configure.in +++ b/configure.in @@ -38,7 +38,6 @@ if test "x$PKG_CONFIG" = "xno"; then fi dnl for use on the build system -dnl pkg-config is stupid BUILD_GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` AC_SUBST(BUILD_GTK_CFLAGS) @@ -57,19 +56,44 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], fi ) -PKG_CHECK_MODULES(MONO_DEPENDENCY, mono) +PKG_CHECK_MODULES(MONO_DEPENDENCY, mono, has_mono=true, has_mono=false) +if test "x$has_mono" = "xtrue"; then if test `uname -s` = "Darwin"; then - MONO=`which mint` + RUNTIME=`which mint` + CSC=`which mcs` else - MONO=`which mono` + RUNTIME=`which mono` + CSC=`which mcs` fi -AC_SUBST(MONO) +else +AC_PATH_PROG(CSC, csc.exe, $PATH) +if test x$CSC = ""; then + AC_MSG_ERROR([You need to install either mono or .Net]) +else +RUNTIME= +fi +fi +AC_SUBST(RUNTIME) +AC_SUBST(CSC) + +PKG_CHECK_MODULES(GLIB, glib-2.0) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +PKG_CHECK_MODULES(XML, libxml-2.0) +AC_SUBST(XML_CFLAGS) +AC_SUBST(XML_LIBS) ## Versions of dependencies -GNOME_REQUIRED_VERSION=2.0.0 +GNOME_REQUIRED_VERSION=2.2.0 GTK_REQUIRED_VERSION=2.2.0 -PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no) + +PKG_CHECK_MODULES(LIBART, libart-2.0 >= $GNOME_REQUIRED_VERSION, enable_libart=yes, enable_libart=no) +AC_SUBST(LIBART_CFLAGS) +AC_SUBST(LIBART_LIBS) + +PKG_CHECK_MODULES(BASE_DEPENDENCIES, libgnomecanvas-2.0 >= $GNOME_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOME_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no) if test "x$enable_gnome" = "xno"; then PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION) @@ -120,6 +144,7 @@ fi AC_SUBST(BASE_DEPENDENCIES_CFLAGS) AC_SUBST(BASE_DEPENDENCIES_LIBS) +AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") AM_CONDITIONAL(ENABLE_GDA, test "x$enable_gda" = "xyes") @@ -132,30 +157,41 @@ AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") AC_SUBST(CFLAGS) AC_OUTPUT([ -glue/Makefile +sources/Makefile parser/Makefile +parser/GAPI/Makefile generator/Makefile generator/gapi-codegen glib/Makefile +glib/glue/Makefile pango/Makefile atk/Makefile art/Makefile gdk/Makefile +gdk/glue/Makefile gtk/Makefile +gtk/glue/Makefile glade/Makefile +glade/glue/Makefile gnome/Makefile +gnome/glue/Makefile gda/Makefile gnomedb/Makefile gconf/Makefile +gconf/doc/Makefile gconf/GConf/Makefile gconf/GConf.PropertyEditors/Makefile gconf/tools/Makefile -gst/Makefile +gconf/tools/gconfsharp-schemagen gtkhtml/Makefile rsvg/Makefile vte/Makefile +sample/GtkDemo/Makefile sample/Makefile +sample/gconf/Makefile +sample/pixmaps/Makefile sample/rsvg/Makefile +sample/test/Makefile gtk-sharp.pc parser/gapi.pc parser/gapi-fixup @@ -169,6 +205,7 @@ echo " * Installation prefix = $prefix" echo "" echo " Optional assemblies included in the build:" echo "" +echo " * art-sharp.dll: $enable_libart" echo " * gnome-sharp.dll: $enable_gnome" echo " * glade-sharp.dll: $enable_glade" echo " * gda-sharp.dll: $enable_gda" diff --git a/gconf/.cvsignore b/gconf/.cvsignore index f3c7a7c5d..282522db0 100644 --- a/gconf/.cvsignore +++ b/gconf/.cvsignore @@ -1 +1,2 @@ Makefile +Makefile.in diff --git a/gconf/GConf.PropertyEditors/.cvsignore b/gconf/GConf.PropertyEditors/.cvsignore index db954114f..f914cb467 100644 --- a/gconf/GConf.PropertyEditors/.cvsignore +++ b/gconf/GConf.PropertyEditors/.cvsignore @@ -1,2 +1,3 @@ Makefile +Makefile.in *.dll diff --git a/gconf/GConf.PropertyEditors/EditorShell.cs b/gconf/GConf.PropertyEditors/EditorShell.cs index 97f1b8fa1..153ab5495 100644 --- a/gconf/GConf.PropertyEditors/EditorShell.cs +++ b/gconf/GConf.PropertyEditors/EditorShell.cs @@ -53,8 +53,8 @@ namespace GConf.PropertyEditors if (control == null) throw new InvalidGladeKeyException (control_name); - if (control is Gnome.ColorPicker) - editor = new PropertyEditorColorPicker (key, (Gnome.ColorPicker) control); + //if (control is Gnome.ColorPicker) + //editor = new PropertyEditorColorPicker (key, (Gnome.ColorPicker) control); else if (control is Gnome.FileEntry) editor = new PropertyEditorFileEntry (key, (Gnome.FileEntry) control); else if (control is Gtk.SpinButton) diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am new file mode 100644 index 000000000..0bb4781e5 --- /dev/null +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -0,0 +1,35 @@ +if ENABLE_GNOME +TARGET=$(ASSEMBLY) +else +TARGET= +endif + +ASSEMBLY = gconf-sharp-peditors.dll +assemblydir = $(libdir) +assembly_DATA = $(TARGET) +CLEANFILES = $(ASSEMBLY) + +EXTRA_DIST = \ + PropertyEditorColorPicker.cs \ + $(sources) + +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:../../glade/glade-sharp.dll /r:../GConf/gconf-sharp.dll + +sources = \ + PropertyEditor.cs \ + PropertyEditorBool.cs \ + PropertyEditorEnum.cs \ + PropertyEditorEntry.cs \ + PropertyEditorFileEntry.cs \ + PropertyEditorOptionMenu.cs \ + PropertyEditorRadioButton.cs \ + PropertyEditorSpinButton.cs \ + PropertyEditorToggleButton.cs \ + EditorShell.cs + +build_sources = $(addprefix $(srcdir)/, $(sources)) + +$(ASSEMBLY): $(build_sources) + $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + diff --git a/gconf/GConf.PropertyEditors/Makefile.in b/gconf/GConf.PropertyEditors/Makefile.in deleted file mode 100644 index c99bfec54..000000000 --- a/gconf/GConf.PropertyEditors/Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ -MCS = mcs -DESTDIR = -prefix=@prefix@ - -SOURCES = \ - PropertyEditor.cs \ - PropertyEditorBool.cs \ - PropertyEditorColorPicker.cs \ - PropertyEditorEnum.cs \ - PropertyEditorEntry.cs \ - PropertyEditorFileEntry.cs \ - PropertyEditorOptionMenu.cs \ - PropertyEditorRadioButton.cs \ - PropertyEditorSpinButton.cs \ - PropertyEditorToggleButton.cs \ - EditorShell.cs \ - # - -all: gconf-sharp-peditors.dll - -gconf-sharp-peditors.dll: $(SOURCES) - $(MCS) $(SOURCES) -L ../../glib -L ../../pango -L ../../atk -L ../../gdk -L ../../gtk -L ../../art -L ../../gnome -L ../GConf -L ../../glade /r:glib-sharp.dll /r:pango-sharp.dll /r:atk-sharp.dll /r:gdk-sharp.dll /r:gtk-sharp.dll /r:art-sharp.dll /r:gnome-sharp.dll /r:glade-sharp.dll /r:gconf-sharp.dll /r:System.Drawing /target:library /out:gconf-sharp-peditors.dll - -install: all - ../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp gconf-sharp-peditors.dll $(DESTDIR)$(prefix)/lib - -clean: - rm -f gconf-sharp-peditors.dll - diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am new file mode 100644 index 000000000..b5dabd2e8 --- /dev/null +++ b/gconf/GConf/Makefile.am @@ -0,0 +1,27 @@ +ASSEMBLY = gconf-sharp.dll +assemblydir = $(libdir) +assembly_DATA = $(ASSEMBLY) +CLEANFILES = $(ASSEMBLY) + +EXTRA_DIST = \ + $(sources) + +references = \ + /r:../../glib/glib-sharp.dll + +sources = \ + ClientBase.cs \ + Client.cs \ + ChangeSet.cs \ + _Entry.cs \ + NoSuchKeyException.cs \ + NotifyEventArgs.cs \ + NotifyEventHandler.cs \ + NotifyWrapper.cs \ + Value.cs + +build_sources = $(addprefix $(srcdir)/, $(sources)) + +$(ASSEMBLY): $(build_sources) + $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + diff --git a/gconf/GConf/Makefile.in b/gconf/GConf/Makefile.in deleted file mode 100644 index 19d6b1d64..000000000 --- a/gconf/GConf/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -MCS = mcs -DESTDIR = -prefix=@prefix@ - -SOURCES = \ - ClientBase.cs \ - Client.cs \ - ChangeSet.cs \ - _Entry.cs \ - NoSuchKeyException.cs \ - NotifyEventArgs.cs \ - NotifyEventHandler.cs \ - NotifyWrapper.cs \ - Value.cs \ - # - -all: gconf-sharp.dll - -gconf-sharp.dll: $(SOURCES) - $(MCS) $(SOURCES) -L ../../glib /r:glib-sharp.dll /target:library /out:gconf-sharp.dll - -install: all - ../../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp gconf-sharp.dll $(DESTDIR)$(prefix)/lib - -clean: - rm -f gconf-sharp.dll - diff --git a/gconf/Makefile.am b/gconf/Makefile.am new file mode 100644 index 000000000..8cb708ad0 --- /dev/null +++ b/gconf/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = GConf GConf.PropertyEditors tools doc diff --git a/gconf/Makefile.in b/gconf/Makefile.in deleted file mode 100644 index 041ff41be..000000000 --- a/gconf/Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ -SUBDIRS = GConf GConf.PropertyEditors tools - -@ENABLE_GNOME_TRUE@ all: linux -@ENABLE_GNOME_FALSE@ all: - -linux: - for i in $(SUBDIRS); do \ - $(MAKE) -C $$i || exit 1; \ - done - -install: all - for i in $(SUBDIRS); do \ - $(MAKE) -C $$i install || exit 1; \ - done - -clean: - for i in $(SUBDIRS); do \ - $(MAKE) -C $$i clean || exit 1; \ - done - -distclean: clean - for i in $(SUBDIRS); do \ - rm -f $$i/Makefile; \ - done diff --git a/gconf/doc/.cvsignore b/gconf/doc/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/gconf/doc/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/gconf/doc/Makefile.am b/gconf/doc/Makefile.am new file mode 100644 index 000000000..a74ac8f88 --- /dev/null +++ b/gconf/doc/Makefile.am @@ -0,0 +1 @@ +EXTRA_DIST = intro.html diff --git a/gconf/tools/.cvsignore b/gconf/tools/.cvsignore index 211d37060..f6f14de8b 100644 --- a/gconf/tools/.cvsignore +++ b/gconf/tools/.cvsignore @@ -1,3 +1,4 @@ Makefile +Makefile.in gconfsharp-schemagen *.exe diff --git a/gconf/tools/Makefile.am b/gconf/tools/Makefile.am new file mode 100644 index 000000000..335537e0d --- /dev/null +++ b/gconf/tools/Makefile.am @@ -0,0 +1,13 @@ +assemblydir = $(bindir) +assembly_DATA = gconfsharp-schemagen.exe +bin_SCRIPTS = gconfsharp-schemagen +CLEANFILES = gconfsharp-schemagen.exe +DISTCLEANFILES = gconfsharp-schemagen + +EXTRA_DIST = \ + schemagen.cs \ + gconfsharp-schemagen.in + +gconfsharp-schemagen.exe: $(srcdir)/schemagen.cs + $(CSC) /out:gconfsharp-schemagen.exe $(srcdir)/schemagen.cs + diff --git a/gconf/tools/Makefile.in b/gconf/tools/Makefile.in deleted file mode 100644 index eb83276f0..000000000 --- a/gconf/tools/Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ -MCS = mcs -DESTDIR = -prefix=@prefix@ -bindir = $(prefix)/bin - -SOURCES = \ - schemagen.cs \ - # - -all: gconfsharp-schemagen.exe gconfsharp-schemagen - -gconfsharp-schemagen.exe: $(SOURCES) - $(MCS) /out:gconfsharp-schemagen.exe $(SOURCES) - -gconfsharp-schemagen: gconfsharp-schemagen.in - sed -e 's^\@bindir\@^$(bindir)^g' < gconfsharp-schemagen.in > gconfsharp-schemagen.tmp \ - && mv gconfsharp-schemagen.tmp gconfsharp-schemagen \ - && chmod +x gconfsharp-schemagen - -install: all - ../../mkinstalldirs $(DESTDIR)$(prefix)/bin && \ - chmod +x gconfsharp-schemagen && cp gconfsharp-schemagen.exe gconfsharp-schemagen $(DESTDIR)$(bindir) - -clean: - rm -f gconfsharp-schemagen.exe - rm -f gconfsharp-schemagen - diff --git a/gda/Makefile.am b/gda/Makefile.am new file mode 100644 index 000000000..fda4ea7a7 --- /dev/null +++ b/gda/Makefile.am @@ -0,0 +1,49 @@ +if ENABLE_GDA +TARGET = $(ASSEMBLY) +APIS = $(API) +else +TARGET = +APIS = +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 +assemblydir = $(libdir) +gapidir = $(datadir)/gapi +assembly_DATA = $(TARGET) +gapi_DATA = $(APIS) +CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) + +sources = \ + Application.cs + +build_sources = $(addprefix $(srcdir)/, $(sources)) + +customs = + +build_customs = $(addprefix $(srcdir)/, $(customs)) + +EXTRA_DIST = \ + $(RAW_API) \ + $(METADATA) \ + $(customs) \ + $(sources) + +$(API): $(srcdir)/$(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) + $(RUNTIME) ../generator/gapi_codegen.exe --generate $(API) \ + --outdir=generated --customdir=$(srcdir) --assembly-name=$(ASSEMBLY_NAME) \ + && touch generated-stamp + +$(ASSEMBLY): $(build_sources) generated-stamp + $(CSC) --unsafe /out:$(ASSEMBLY) /target:library $(references) $(build_sources) generated/*.cs + diff --git a/gda/Makefile.in b/gda/Makefile.in deleted file mode 100755 index 2d72197ac..000000000 --- a/gda/Makefile.in +++ /dev/null @@ -1,38 +0,0 @@ -APIS= gda-api.xml - -RUNTIME=@MONO@ -MCS=mcs -ASSEMBLY=gda-sharp.dll - -@ENABLE_GDA_TRUE@ all: $(ASSEMBLY) -@ENABLE_GDA_FALSE@ all: - -all: $(ASSEMBLY) - -generated-stamp: $(APIS) ../generator/gapi_codegen.exe Gda.metadata - $(RUNTIME) ../parser/gapi-fixup.exe --api=gda-api.xml --metadata=Gda.metadata && \ - $(RUNTIME) ../generator/gapi_codegen.exe \ - --generate $(APIS) --outdir=generated --customdir=. \ - --assembly-name=gda-sharp && touch generated-stamp - -$(ASSEMBLY): generated-stamp *.cs - $(MCS) --unsafe --target library \ - -r ../glib/glib-sharp.dll -o $(ASSEMBLY) --recurse '*.cs' - -clean: - rm -f generated-stamp - rm -f $(ASSEMBLY) - rm -rf generated - -prefix=@prefix@ -DESTDIR= -apidir=$(DESTDIR)$(prefix)/share/gapi -libdir=$(DESTDIR)$(prefix)/lib - -install: all -@ENABLE_GDA_TRUE@ ../mkinstalldirs $(libdir) && \ -@ENABLE_GDA_TRUE@ ../mkinstalldirs $(apidir) && \ -@ENABLE_GDA_TRUE@ for i in $(APIS); do \ -@ENABLE_GDA_TRUE@ cp $$i $(apidir) || true; \ -@ENABLE_GDA_TRUE@ done && \ -@ENABLE_GDA_TRUE@ cp $(ASSEMBLY) $(libdir) diff --git a/gda/gda-api.xml b/gda/gda-api.raw similarity index 52% rename from gda/gda-api.xml rename to gda/gda-api.raw index 1f2e61150..38bab8efc 100644 --- a/gda/gda-api.xml +++ b/gda/gda-api.raw @@ -1,5 +1,6 @@ - - - - + + + - - - - - - - + + + + + + + - - - + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - + - - - + + + - + - + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - + - + - - - + + + - + - + - + - + - + - + - - + + - + - - - + + + - + - - + + - + - - + + - + - - + + - + - - - - + + + + - + - - - + + + - + - + - + - + - - + + - + - - + + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - + - - - + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - - + - + - + - + - - + + - + - + - + - + - - + + - + - + - - - + + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + -