From 13d2c2cffbbba790e8ed251b8b08b885d9518cc0 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Fri, 28 Jul 2006 19:37:43 +0000 Subject: [PATCH] 2006-07-28 Mike Kestner * *: huge amounts of surgery to split off gnome-sharp module. Clean out all the gnome related stuff from the auto* files. make distcheck works on the leaner-meaner gtk-sharp module. svn path=/trunk/gtk-sharp/; revision=63111 --- ChangeLog | 6 +++ Makefile.am | 4 +- bootstrap-2.10 | 5 --- bootstrap-generic | 6 --- configure.in.in | 107 --------------------------------------------- doc/Makefile.am | 4 -- sample/Makefile.am | 57 +++--------------------- 7 files changed, 12 insertions(+), 177 deletions(-) diff --git a/ChangeLog b/ChangeLog index 752b071e0..cc329d703 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-28 Mike Kestner + + * *: huge amounts of surgery to split off gnome-sharp module. + Clean out all the gnome related stuff from the auto* files. + make distcheck works on the leaner-meaner gtk-sharp module. + 2006-07-27 Mike Kestner * bootstrap*: kill the 2.4/2.6/2.8 straps, they are on a diff --git a/Makefile.am b/Makefile.am index e9e313526..f1d47b52e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gtkhtml gconf rsvg vte gtkdotnet sample doc +SUBDIRS = sources generator parser glib pango atk gdk gtk glade gtkdotnet sample doc EXTRA_DIST = \ gtk-sharp.snk \ @@ -11,7 +11,5 @@ EXTRA_DIST = \ README \ README.generator -#DISTCLEANFILES = AssemblyInfo.cs - configure.in: bootstrap.status configure.in.in $(SHELL) $< diff --git a/bootstrap-2.10 b/bootstrap-2.10 index 594e175c0..09f732b01 100755 --- a/bootstrap-2.10 +++ b/bootstrap-2.10 @@ -5,13 +5,8 @@ GTK_SHARP_VERSION=2.9.0 ASSEMBLY_VERSION=2.10.0.0 POLICY_VERSIONS="2.4 2.6 2.8" GTK_REQUIRED_VERSION=2.10.0 -GNOME_REQUIRED_VERSION=2.15.0 -GNOMECANVAS_REQUIRED_VERSION=2.14.0 -GNOMEPANEL_REQUIRED_VERSION=2.14.0 -GNOMEPRINT_REQUIRED_VERSION=2.10.0 VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10" VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10" GTK_API_TAG=2.10 -GNOME_API_TAG=2.16 . ./bootstrap-generic "$@" diff --git a/bootstrap-generic b/bootstrap-generic index 982520b27..3e6f474c0 100755 --- a/bootstrap-generic +++ b/bootstrap-generic @@ -16,10 +16,6 @@ set -x sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" \ -e "s/@GTK_REQUIRED_VERSION@/$GTK_REQUIRED_VERSION/" \ - -e "s/@GNOME_REQUIRED_VERSION@/$GNOME_REQUIRED_VERSION/" \ - -e "s/@GNOMECANVAS_REQUIRED_VERSION@/$GNOMECANVAS_REQUIRED_VERSION/" \ - -e "s/@GNOMEPANEL_REQUIRED_VERSION@/$GNOMEPANEL_REQUIRED_VERSION/" \ - -e "s/@GNOMEPRINT_REQUIRED_VERSION@/$GNOMEPRINT_REQUIRED_VERSION/" \ -e "s/@VERSIONCSDEFINES@/$VERSIONCSDEFINES/" \ -e "s/@VERSIONCFLAGS@/$VERSIONCFLAGS/" \ -e "s/@POLICY_VERSIONS@/$POLICY_VERSIONS/" \ @@ -29,8 +25,6 @@ ln -f $srcdir/pango/pango-api-$GTK_API_TAG.raw $srcdir/pango/pango-api.raw ln -f $srcdir/atk/atk-api-$GTK_API_TAG.raw $srcdir/atk/atk-api.raw ln -f $srcdir/gdk/gdk-api-$GTK_API_TAG.raw $srcdir/gdk/gdk-api.raw ln -f $srcdir/gtk/gtk-api-$GTK_API_TAG.raw $srcdir/gtk/gtk-api.raw -ln -f $srcdir/gnomevfs/gnome-vfs-api-$GNOME_API_TAG.raw $srcdir/gnomevfs/gnome-vfs-api.raw -ln -f $srcdir/gnome/gnome-api-$GNOME_API_TAG.raw $srcdir/gnome/gnome-api.raw EOF chmod +x bootstrap.status diff --git a/configure.in.in b/configure.in.in index b6bb03377..98fca5e64 100644 --- a/configure.in.in +++ b/configure.in.in @@ -173,74 +173,11 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -## Versions of dependencies -GNOME_REQUIRED_VERSION=@GNOME_REQUIRED_VERSION@ -ART_REQUIRED_VERSION=2.3.16 - -PKG_CHECK_MODULES(LIBART, libart-2.0 >= $ART_REQUIRED_VERSION, enable_libart=yes, enable_libart=no) -AC_SUBST(LIBART_CFLAGS) -AC_SUBST(LIBART_LIBS) - -PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOME_REQUIRED_VERSION, enable_gnomevfs=yes, enable_gnomevfs=no) -AC_SUBST(GNOMEVFS_CFLAGS) -AC_SUBST(GNOMEVFS_LIBS) - -GNOMECANVAS_REQUIRED_VERSION=@GNOMECANVAS_REQUIRED_VERSION@ -GNOMEPANEL_REQUIRED_VERSION=@GNOMEPANEL_REQUIRED_VERSION@ -GNOMEPRINT_REQUIRED_VERSION=@GNOMEPRINT_REQUIRED_VERSION@ - -PKG_CHECK_MODULES(GNOME, libgnomecanvas-2.0 >= $GNOMECANVAS_REQUIRED_VERSION libgnomeui-2.0 >= $GNOME_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION libgnomeprintui-2.2 >= $GNOMEPRINT_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION libpanelapplet-2.0 >= $GNOMEPANEL_REQUIRED_VERSION, enable_gnome=yes, enable_gnome=no) -AC_SUBST(GNOME_CFLAGS) -AC_SUBST(GNOME_LIBS) - GLADE_REQUIRED_VERSION=2.3.6 PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=yes, enable_glade=no) AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_LIBS) -RSVG_REQUIRED_VERSION=2.0.1 -PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no) - -if test "x$enable_gnome" = "xyes"; then -GTKHTML_REQUIRED_VERSION=3.8.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.8 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.8 -GTKHTML_SOVERSION=15 -else -GTKHTML_REQUIRED_VERSION=3.6.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.6 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.6 -GTKHTML_SOVERSION=18 -else -GTKHTML_REQUIRED_VERSION=3.2.0 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.1 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.1 -GTKHTML_SOVERSION=11 -else -GTKHTML_REQUIRED_VERSION=3.0.10 -PKG_CHECK_MODULES(GTKHTML_DEPENDENCIES, libgtkhtml-3.0 >= $GTKHTML_REQUIRED_VERSION, enable_gtkhtml=yes, enable_gtkhtml=no) -if test "x$enable_gtkhtml" = "xyes"; then -GTKHTML_VERSION=3.0 -GTKHTML_SOVERSION=4 -else -GTKHTML_VERSION= -GTKHTML_SOVERSION= -fi -fi -fi -fi -AC_SUBST(GTKHTML_VERSION) -AC_SUBST(GTKHTML_SOVERSION) -else -enable_gtkhtml=no -fi - -VTE_REQUIRED_VERSION=0.11.10 -PKG_CHECK_MODULES(VTE_DEPENDENCIES, vte >= $VTE_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION, enable_vte=yes, enable_vte=no) - AC_PATH_PROG(MDASSEMBLER, mdassembler, no) AC_PATH_PROG(MONODOCER, monodocer, no) if test "x$MONODOCER" = "xno" -o "x$MDASSEMBLER" = "xno"; then @@ -253,17 +190,10 @@ fi AC_SUBST(MDASSEMBLER) AC_SUBST(MONODOCER) -AM_CONDITIONAL(ENABLE_LIBART, test "x$enable_libart" = "xyes") -AM_CONDITIONAL(ENABLE_GNOMEVFS, test "x$enable_gnomevfs" = "xyes") -AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes") AM_CONDITIONAL(ENABLE_GLADE, test "x$enable_glade" = "xyes") -AM_CONDITIONAL(ENABLE_RSVG, test "x$enable_rsvg" = "xyes") -AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes") -AM_CONDITIONAL(ENABLE_VTE, test "x$enable_vte" = "xyes") AM_CONDITIONAL(ENABLE_DOTNET, test "x$enable_dotnet" = "xyes") AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes") AM_CONDITIONAL(ENABLE_MONOGETOPTIONS, test "x$has_mono" = "xtrue") -AM_CONDITIONAL(ENABLE_ALL_OPTIONAL, test "x$enable_libart" = "xyes" -a "x$enable_gnomevfs" = "xyes" -a "x$enable_gnome" = "xyes" -a "x$enable_glade" = "xyes" -a "x$enable_rsvg" = "xyes" -a "x$enable_gtkhtml" = "xyes" -a "x$enable_vte" = "xyes" -a "x$enable_dotnet" = "xyes" -a "x$enable_monodoc" = "xyes") AC_SUBST(CFLAGS) @@ -287,9 +217,6 @@ pango/pango-sharp.dll.config pango/glue/Makefile atk/Makefile atk/atk-sharp.dll.config -art/Makefile -art/art-sharp.dll.config -art/art-sharp-2.0.pc gdk/Makefile gdk/gdk-sharp.dll.config gdk/glue/Makefile @@ -301,41 +228,13 @@ glade/Makefile glade/glade-sharp.dll.config glade/glade-sharp-2.0.pc glade/glue/Makefile -gnome/Makefile -gnome/gnome-sharp.dll.config -gnome/gnome-sharp-2.0.pc -gnome/glue/Makefile -gnomevfs/Makefile -gnomevfs/gnome-vfs-sharp.dll.config -gnomevfs/gnome-vfs-sharp-2.0.pc -gconf/Makefile -gconf/doc/Makefile -gconf/GConf/Makefile -gconf/GConf/gconf-sharp.dll.config -gconf/GConf/gconf-sharp-2.0.pc -gconf/GConf.PropertyEditors/Makefile -gconf/tools/Makefile -gconf/tools/gconfsharp2-schemagen -gtkhtml/Makefile -gtkhtml/gtkhtml-sharp.dll.config -gtkhtml/gtkhtml-sharp-2.0.pc -rsvg/Makefile -rsvg/rsvg-sharp.dll.config -rsvg/rsvg-sharp-2.0.pc -vte/Makefile -vte/glue/Makefile -vte/vte-sharp.dll.config -vte/vte-sharp-2.0.pc gtkdotnet/Makefile gtkdotnet/gtk-dotnet.dll.config gtkdotnet/gtk-dotnet-2.0.pc doc/Makefile sample/GtkDemo/Makefile sample/Makefile -sample/gconf/Makefile -sample/gnomevfs/Makefile sample/pixmaps/Makefile -sample/rsvg/Makefile sample/test/Makefile sample/valtest/Makefile sample/valtest/valtest.exe.config @@ -352,13 +251,7 @@ echo " * $CS compiler: $CSC $CSFLAGS" echo "" echo " Optional assemblies included in the build:" echo "" -echo " * art-sharp.dll: $enable_libart" -echo " * gnomevfs-sharp.dll: $enable_gnomevfs" -echo " * gnome-sharp.dll: $enable_gnome" echo " * glade-sharp.dll: $enable_glade" -echo " * rsvg-sharp.dll: $enable_rsvg " -echo " * gtkhtml-sharp.dll: $enable_gtkhtml " -echo " * vte-sharp.dll: $enable_vte " echo " * gtk-dotnet.dll: $enable_dotnet " echo "" echo " NOTE: if any of the above say 'no' you may install the" diff --git a/doc/Makefile.am b/doc/Makefile.am index 3d911897d..98904188d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,11 +17,7 @@ ASSEMBLIES = \ UPDATE_ASSEMBLIES = $(addprefix -assembly:lib/, $(ASSEMBLIES)) -if ENABLE_ALL_OPTIONAL UPDATER = $(MONODOCER) -path:en $(UPDATE_ASSEMBLIES) -else -UPDATER = echo "All optional assemblies must be built to use the updater." && exit 1 -endif if ENABLE_MONODOC SOURCESDIR=$(prefix)/lib/monodoc/sources diff --git a/sample/Makefile.am b/sample/Makefile.am index 63facd88c..43c47cdc1 100755 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -1,20 +1,4 @@ -SUBDIRS = gconf rsvg test GtkDemo pixmaps gnomevfs valtest opaquetest - -if ENABLE_GNOME -GNOME_TARGETS=gnome-hello-world.exe canvas-example.exe fifteen.exe print.exe -GNOME_ASSEMBLY=../art/art-sharp.dll ../gnome/gnome-sharp.dll -else -GNOME_TARGETS= -GNOME_ASSEMBLY= -endif - -if ENABLE_GNOMEVFS -GNOMEVFS_TARGETS=testvfs.exe -GNOMEVFS_ASSEMBLY=../gnomevfs/gnome-vfs-sharp.dll -else -GNOMEVFS_TARGETS= -GNOMEVFS_ASSEMBLY= -endif +SUBDIRS = test GtkDemo pixmaps valtest opaquetest if ENABLE_GLADE GLADE_TARGETS=glade-viewer.exe glade-test.exe @@ -24,14 +8,6 @@ GLADE_TARGETS= GLADE_ASSEMBLY= endif -if ENABLE_VTE -VTE_TARGETS=vte-example.exe -VTE_ASSEMBLY=../vte/vte-sharp.dll -else -VTE_TARGETS= -VTE_ASSEMBLY= -endif - if ENABLE_DOTNET DOTNET_TARGETS=drawing-sample.exe DOTNET_ASSEMBLY=../gtkdotnet/gtk-dotnet.dll @@ -40,11 +16,11 @@ DOTNET_TARGETS= DOTNET_ASSEMBLY= endif -TARGETS = polarfixed.exe custom-widget.exe custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe scribble-xinput.exe treeviewdemo.exe managedtreeviewdemo.exe nodeviewdemo.exe testdnd.exe actions.exe $(GNOMEVFS_TARGETS) $(GNOME_TARGETS) $(GLADE_TARGETS) $(VTE_TARGETS) $(DOTNET_TARGETS) +TARGETS = polarfixed.exe custom-widget.exe custom-cellrenderer.exe gtk-hello-world.exe button.exe calendar.exe subclass.exe menu.exe size.exe scribble.exe scribble-xinput.exe treeviewdemo.exe managedtreeviewdemo.exe nodeviewdemo.exe testdnd.exe actions.exe $(GLADE_TARGETS) $(DOTNET_TARGETS) DEBUGS = $(addsuffix .mdb, $(TARGETS)) -assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GNOMEVFS_ASSEMBLY) $(GNOME_ASSEMBLY) $(GLADE_ASSEMBLY) $(VTE_ASSEMBLY) +assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GLADE_ASSEMBLY) references=$(addprefix /r:, $(assemblies)) noinst_SCRIPTS = $(TARGETS) @@ -53,18 +29,6 @@ CLEANFILES = $(TARGETS) $(DEBUGS) gtk-hello-world.exe: $(srcdir)/HelloWorld.cs $(assemblies) $(CSC) /out:gtk-hello-world.exe $(references) $(srcdir)/HelloWorld.cs -gnome-hello-world.exe: $(srcdir)/GnomeHelloWorld.cs $(assemblies) - $(CSC) /out:gnome-hello-world.exe $(references) $(srcdir)/GnomeHelloWorld.cs - -canvas-example.exe: $(srcdir)/CanvasExample.cs $(assemblies) - $(CSC) /out:canvas-example.exe $(references) $(srcdir)/CanvasExample.cs - -fifteen.exe: $(srcdir)/Fifteen.cs $(assemblies) - $(CSC) /out:fifteen.exe $(references) $(srcdir)/Fifteen.cs - -print.exe: $(srcdir)/PrintSample.cs $(assemblies) - $(CSC) /out:print.exe $(references) $(srcdir)/PrintSample.cs - button.exe: $(srcdir)/ButtonApp.cs $(assemblies) $(CSC) /out:button.exe $(references) $(srcdir)/ButtonApp.cs @@ -107,9 +71,6 @@ cairo-sample.exe: $(srcdir)/CairoSample.cs $(srcdir)/GtkCairo.cs $(assemblies) testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies) $(CSC) /debug /unsafe /out:testdnd.exe $(references) $(srcdir)/TestDnd.cs -vte-example.exe: $(srcdir)/VteTest.cs $(assemblies) - $(CSC) /debug /unsafe /out:vte-example.exe $(references) $(srcdir)/VteTest.cs - custom-cellrenderer.exe: $(srcdir)/CustomCellRenderer.cs $(assemblies) $(CSC) /debug /out:custom-cellrenderer.exe $(references) $(srcdir)/CustomCellRenderer.cs @@ -127,15 +88,8 @@ actions.exe: $(srcdir)/Actions.cs polarfixed.exe: $(srcdir)/PolarFixed.cs $(assemblies) $(CSC) /debug /out:polarfixed.exe $(references) $(srcdir)/PolarFixed.cs -testvfs.exe: $(srcdir)/TestVfs.cs $(assemblies) - $(CSC) /debug /out:testvfs.exe $(references) $(srcdir)/TestVfs.cs - EXTRA_DIST = \ HelloWorld.cs \ - GnomeHelloWorld.cs \ - CanvasExample.cs \ - Fifteen.cs \ - PrintSample.cs \ ButtonApp.cs \ CalendarApp.cs \ Subclass.cs \ @@ -151,11 +105,10 @@ EXTRA_DIST = \ test.glade \ CairoSample.cs \ TestDnd.cs \ - VteTest.cs \ CustomCellRenderer.cs \ DrawingSample.cs \ cairo-sample.exe.config \ CustomWidget.cs \ Actions.cs \ - PolarFixed.cs \ - TestVfs.cs + PolarFixed.cs +