ryujinx-archive/GtkSharp
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* configure.in.in: kill off all gda/gnomedb references.

Browse source 
(Henceforth gda# and gnomedb# will be part of gda and gnomedb. Or
	maybe separate modules in Mono SVN. Not part of gtk-sharp though.)

	* Makefile.am (SUBDIRS): remove gda and gnomedb

	* gda/, gnomedb/: buh-bye

svn path=/trunk/gtk-sharp/; revision=48200
This commit is contained in:
Dan Winship 2005-08-09 20:10:45 +00:00
parent 1428e774c8
commit 963ae98d5d
18 changed files with 13 additions and 4946 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-08-09 Dan Winship <danw@novell.com>
* configure.in.in: kill off all gda/gnomedb references.
(Henceforth gda# and gnomedb# will be part of gda and gnomedb. Or
maybe separate modules in Mono SVN. Not part of gtk-sharp though.)
* Makefile.am (SUBDIRS): remove gda and gnomedb
* gda/, gnomedb/: buh-bye
2005-08-09 Dan Winship <danw@novell.com>
* generator/ClassBase.cs (Validate): Don't fully validate the

2
Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gda gnomedb gtkhtml gconf rsvg vte gtkdotnet sample doc
SUBDIRS = sources generator parser glib pango atk gdk gtk glade art gnomevfs gnome gtkhtml gconf rsvg vte gtkdotnet sample doc
EXTRA_DIST = \
gtk-sharp.snk \

22
configure.in.in
View file

@ -155,16 +155,6 @@ PKG_CHECK_MODULES(GLADE, libglade-2.0 >= $GLADE_REQUIRED_VERSION, enable_glade=y
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
LIBGDA_REQUIRED_VERSION=1.0.0
PKG_CHECK_MODULES(LIBGDA_DEPENDENCIES, libgda >= $LIBGDA_REQUIRED_VERSION, enable_gda=yes, enable_gda=no)
enable_gnomedb=no
if test "x$enable_gnome" = "xyes"; then
if test "x$enable_gda" = "xyes"; then
PKG_CHECK_MODULES(LIBGNOMEDB_DEPENDENCIES, libgnomedb >= $LIBGDA_REQUIRED_VERSION, enable_gnomedb=yes, enable_gnomedb=no)
fi
fi
RSVG_REQUIRED_VERSION=2.0.1
PKG_CHECK_MODULES(RSVG_DEPENDENCIES, librsvg-2.0 >= $RSVG_REQUIRED_VERSION, enable_rsvg=yes, enable_rsvg=no)
@ -226,14 +216,12 @@ 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_GDA, test "x$enable_gda" = "xyes")
AM_CONDITIONAL(ENABLE_GNOMEDB, test "x$enable_gnomedb" = "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_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_gda" = "xyes" -a "x$enable_gnomedb" = "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")
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)
@ -276,12 +264,6 @@ gnome/glue/Makefile
gnomevfs/Makefile
gnomevfs/gnome-vfs-sharp.dll.config
gnomevfs/gnome-vfs-sharp-2.0.pc
gda/Makefile
gda/gda-sharp.dll.config
gda/gda-sharp-2.0.pc
gnomedb/Makefile
gnomedb/gnomedb-sharp.dll.config
gnomedb/gnomedb-sharp-2.0.pc
gconf/Makefile
gconf/doc/Makefile
gconf/GConf/Makefile
@ -330,8 +312,6 @@ 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 " * gda-sharp.dll: $enable_gda"
echo " * gnomedb-sharp.dll: $enable_gnomedb"
echo " * rsvg-sharp.dll: $enable_rsvg "
echo " * gtkhtml-sharp.dll: $enable_gtkhtml "
echo " * vte-sharp.dll: $enable_vte "

89
gda/Application.cs
View file

@ -1,89 +0,0 @@
// Gda.Application.cs - libgda initialization and event loop
//
// Author: Rodrigo Moya <rodrigo@ximian.com>
//
// Copyright (c) 2002 Rodrigo Moya
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
using System;
using System.Runtime.InteropServices;
namespace Gda
{
public class Application
{
private const string VERSION = "0.10";
[DllImport("gda-2")]
static extern void gda_init (IntPtr app_id, IntPtr version, int nargs, IntPtr args);
[DllImport("gda-2")]
static extern void gda_init (IntPtr app_id, IntPtr version, ref int argc, ref IntPtr argv);
public static void Init ()
{
Init ("Gda#", VERSION);
}
public static void Init (string app_id, string version)
{
IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id);
IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version);
gda_init (native_appid, native_version, 0, IntPtr.Zero);
GLib.Marshaller.Free (native_appid);
GLib.Marshaller.Free (native_version);
}
public static void Init (ref string[] args)
{
Init ("Gda#", VERSION, ref args);
}
public static void Init (string app_id, string version, ref string[] args)
{
IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id);
IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version);
GLib.Argv argv = new GLib.Argv (args);
IntPtr arg_ptr = argv.Handle;
int argc = args.Length;
gda_init (native_appid, native_version, ref argc, ref arg_ptr);
GLib.Marshaller.Free (native_appid);
GLib.Marshaller.Free (native_version);
if (arg_ptr != argv.Handle)
throw new Exception ("Init returned new argv handle.");
if (argc <= 1)
args = new string [0];
else
args = argv.GetArgs (argc);
}
[DllImport("gda-2")]
static extern void gda_main_run (IntPtr init_func, IntPtr user_data);
public static void Run ()
{
gda_main_run (IntPtr.Zero, IntPtr.Zero);
}
[DllImport("gda-2")]
static extern void gda_main_quit ();
public static void Quit ()
{
gda_main_quit ();
}
}
}

29
gda/Gda.metadata
View file

@ -1,29 +0,0 @@
<?xml version="1.0"?>
<metadata>
<attr path="//class[@cname='GdaType_']" name="hidden">1</attr>
<attr path="//object[@cname='GdaDataModel']/method[@name='ToXmlNode']" name="hidden">1</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='Changed']" name="name">DataChanged</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='BeginEdit']" name="name">BeginEditing</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='CancelEdit']" name="name">CancelEditing</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='EndEdit']" name="name">EndEditing</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='RowInserted']" name="name">RowInsertedEvent</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='RowUpdated']" name="name">RowUpdatedEvent</attr>
<attr path="//object[@cname='GdaDataModel']/signal[@name='RowRemoved']" name="name">RowRemovedEvent</attr>
<attr path="//object[@cname='GdaDataModelArray']/method[@name='SetNColumns']" name="new_flag">1</attr>
<attr path="//object[@cname='GdaDataModelHash']/method[@name='SetNColumns']" name="new_flag">1</attr>
<attr path="//object[@cname='GdaExport']" name="hidden">1</attr>
<attr path="//object[@cname='GdaXmlDatabase']/signal[@name='Changed']" name="name">DataChanged</attr>
<attr path="//struct[@cname='GdaCommand']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaCommand']/method[@name='Free']" name="deprecated">1</attr>
<attr path="//struct[@cname='GdaFieldAttributes']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaFieldAttributes']/method[@name='Free']" name="deprecated">1</attr>
<attr path="//struct[@cname='GdaParameter']" name="opaque">1</attr>
<attr path="//struct[@cname='GdaParameter']/method[@name='Free']" name="deprecated">1</attr>
<attr path="//struct[@cname='GdaParameterList']/method[@name='Free']" name="deprecated">1</attr>
<attr path="//struct[@cname='GdaQuarkList']/method[@name='Free']" name="deprecated">1</attr>
<attr path="//struct[@cname='GdaRow']/method[@name='Free']" name="deprecated">1</attr>
<attr path="/api/namespace/struct[@cname='GdaValue']" name="opaque">1</attr>
<attr path="/api/namespace/struct[@cname='GdaValue']/method[@name='Free']" name="deprecated">1</attr>
<attr path="/api/namespace/struct[@cname='GdaValue']/method[@cname='gda_value_get_type']" name="name">GetGdaType</attr>
</metadata>

22
gda/Makefile.am
View file

@ -1,22 +0,0 @@
if ENABLE_GDA
pkg = gda
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gda-sharp-2.0.pc
else
pkg =
endif
METADATA = Gda.metadata
SYMBOLS =
references = ../glib/glib-sharp.dll
sources = \
Application.cs
customs = \
XmlConnection.custom
add_dist = gda-sharp-2.0.pc.in
include ../Makefile.include

29
gda/XmlConnection.custom
View file

@ -1,29 +0,0 @@
// Gda.XmlConnection.custom - XmlConnection class customizations
//
// Author: Mike Kestner <mkestner@novell.com>
//
// Copyright (C) 2005 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
public static XmlConnection NewFromFile (string filename)
{
IntPtr filename_as_native = GLib.Marshaller.StringToPtrGStrdup (filename);
XmlConnection ret = new XmlConnection (gda_xml_connection_new_from_file (filename_as_native));
GLib.Marshaller.Free (filename_as_native);
return ret;
}

3234
gda/gda-api.raw
View file

File diff suppressed because it is too large Load diff

11
gda/gda-sharp-2.0.pc.in
View file

@ -1,11 +0,0 @@
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

4
gda/gda-sharp.dll.config.in
View file

@ -1,4 +0,0 @@
<configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="gda-2" target="libgda-2@LIB_PREFIX@.1@LIB_SUFFIX@"/>
</configuration>

2
generator/CallbackGen.cs
View file

@ -143,7 +143,7 @@ namespace GtkSharp.Generation {
SymbolTable table = SymbolTable.Table;
ClassBase ret_wrapper = table.GetClassGen (retval.CType);
if (ret_wrapper != null && (ret_wrapper is ObjectGen || ret_wrapper is OpaqueGen || ret_wrapper is InterfaceGen))
if (ret_wrapper != null && ret_wrapper is HandleBase)
sw.WriteLine ("(({0}) {1}).Handle;", retval.CSType, invoke);
else if (table.IsStruct (retval.CType) || table.IsBoxed (retval.CType)) {
// Shoot. I have no idea what to do here.

91
gnomedb/Application.cs
View file

@ -1,91 +0,0 @@
// GnomeDb.Application.cs - libgnomedb initialization and event loop
//
// Author: Rodrigo Moya <rodrigo@ximian.com>
//
// Copyright (c) 2002 Rodrigo Moya
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
using System;
using System.Runtime.InteropServices;
namespace GnomeDb
{
public class Application
{
private const string VERSION = "0.10";
[DllImport("gnomedb-2")]
static extern void gnome_db_init (IntPtr app_id, IntPtr version, int nargs, IntPtr args);
public static void Init ()
{
Init ("GnomeDb#", VERSION);
}
public static void Init (string app_id, string version)
{
IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id);
IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version);
gnome_db_init (native_appid, native_version, 0, IntPtr.Zero);
GLib.Marshaller.Free (native_appid);
GLib.Marshaller.Free (native_version);
}
[DllImport("gnomedb-2")]
static extern void gnome_db_init (IntPtr app_id, IntPtr version, ref int argc, ref IntPtr argv);
public static void Init (ref string [] args)
{
Init ("GnomeDb#", VERSION, ref args);
}
public static void Init (string app_id, string version, ref string[] args)
{
IntPtr native_appid = GLib.Marshaller.StringToPtrGStrdup (app_id);
IntPtr native_version = GLib.Marshaller.StringToPtrGStrdup (version);
GLib.Argv argv = new GLib.Argv (args);
IntPtr arg_ptr = argv.Handle;
int argc = args.Length;
gnome_db_init (native_appid, native_version, ref argc, ref arg_ptr);
GLib.Marshaller.Free (native_appid);
GLib.Marshaller.Free (native_version);
if (arg_ptr != argv.Handle)
throw new Exception ("Init returned new argv handle.");
if (argc <= 1)
args = new string [0];
else
args = argv.GetArgs (argc);
}
[DllImport("gnomedb-2")]
static extern void gnome_db_main_run (IntPtr init_func, IntPtr user_data);
public static void Run ()
{
gnome_db_main_run (IntPtr.Zero, IntPtr.Zero);
}
[DllImport("gnomedb-2")]
static extern void gnome_db_main_quit ();
public static void Quit ()
{
gnome_db_main_quit ();
}
}
}

21
gnomedb/Editor.custom
View file

@ -1,21 +0,0 @@
// Copyright (c) 2005 Novell, Inc.
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of version 2 of the Lesser GNU General
// Public License as published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this program; if not, write to the
// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
[Obsolete ("Replaced by Test property.")]
public void SetText (string text)
{
Text = text;
}

7
gnomedb/GnomeDb.metadata
View file

@ -1,7 +0,0 @@
<?xml version="1.0"?>
<metadata>
<attr path="/api/namespace/callback[@cname='DbShellCallbackFunc']" name="hidden">1</attr>
<attr path="//class[@cname='GnomeDbStock_']" name="name">StockManager</attr>
<attr path="//object[@cname='GnomeDbControl']" name="hidden">1</attr>
<attr path="//object[@cname='GnomeDbWindow']" name="hidden">1</attr>
</metadata>

23
gnomedb/Makefile.am
View file

@ -1,23 +0,0 @@
if ENABLE_GNOMEDB
pkg = gnomedb
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gnomedb-sharp-2.0.pc
else
pkg =
APIS =
endif
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
SYMBOLS =
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
customs = \
Editor.custom
add_dist = gnomedb-sharp-2.0.pc.in
include ../Makefile.include

1348
gnomedb/gnomedb-api.raw
View file

File diff suppressed because it is too large Load diff

11
gnomedb/gnomedb-sharp-2.0.pc.in
View file

@ -1,11 +0,0 @@
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

4
gnomedb/gnomedb-sharp.dll.config.in
View file

@ -1,4 +0,0 @@
<configuration>
<dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
<dllmap dll="gnomedb-2" target="libgnomedb-2@LIB_PREFIX@.3@LIB_SUFFIX@"/>
</configuration>