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

2003-10-06 Mike Kestner <mkestner@ximian.com>

Browse source 
* Makefile.in : add gtkhtml dir.
	* configure.in : expand gtkhtml/Makefile
	* api/Makefile.in : remove gtkhtml-api.xml
	* generator/CodeGenerator.cs : parse new --outdir, --customdir,
	and --assembly-name args.
	* generator/GenerationInfo.cs (Ctor): new (dir, dir,assembly) ctor
	* gtkhtml/HTMLStream.custom : moved here from gtk dir
	* gtkhtml/gtkhtml-api.xml : moved here from api dir
	* gtkhtml/Makefile.in : gen source and build dll
	* sources/gtk-sharp-sources.xml : write gtkhtml api to new dir

svn path=/trunk/gtk-sharp/; revision=18696
This commit is contained in:
Mike Kestner 2003-10-07 05:52:23 +00:00
parent 9a0e14875a
commit 65fec771bb
10 changed files with 76 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2003-10-06 Mike Kestner <mkestner@ximian.com>
* Makefile.in : add gtkhtml dir.
* configure.in : expand gtkhtml/Makefile
* api/Makefile.in : remove gtkhtml-api.xml
* generator/CodeGenerator.cs : parse new --outdir, --customdir,
and --assembly-name args.
* generator/GenerationInfo.cs (Ctor): new (dir, dir,assembly) ctor
* gtkhtml/HTMLStream.custom : moved here from gtk dir
* gtkhtml/gtkhtml-api.xml : moved here from api dir
* gtkhtml/Makefile.in : gen source and build dll
* sources/gtk-sharp-sources.xml : write gtkhtml api to new dir
2003-10-06 Artem Popov <artemis@yandex.ru>
* gtk/Dialog.custom : Action area is an HButtonBox, not a VBox.

2
Makefile.in
View file

@ -1,6 +1,6 @@
NATIVE_DIRS = glue parser
DIRS=generator api glib pango atk gdk gtk glade art gnome gda gnomedb gconf rsvg sample
DIRS=generator api glib pango atk gdk gtk glade art gnome gtkhtml gda gnomedb gconf rsvg sample
ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT)))
CSC=$(ROOT)/microsoft.net/framework/v1.0.3705/csc.exe
MCS=mcs

1
api/Makefile.in
View file

@ -4,7 +4,6 @@ APIS = \
gdk-api.xml \
gdk-symbols.xml \
gtk-api.xml \
gtkhtml-api.xml \
gtk-symbols.xml \
glade-api.xml \
art-api.xml \

1
configure.in
View file

@ -127,6 +127,7 @@ gconf/GConf/Makefile
gconf/GConf.PropertyEditors/Makefile
gconf/tools/Makefile
gst/Makefile
gtkhtml/Makefile
rsvg/Makefile
sample/Makefile
sample/rsvg/Makefile

24
generator/CodeGenerator.cs
View file

@ -21,6 +21,9 @@ namespace GtkSharp.Generation {
bool generate = false;
bool include = false;
string dir = "";
string custom_dir = "";
string assembly_name = "";
SymbolTable table = SymbolTable.Table;
ArrayList gens = new ArrayList ();
@ -33,6 +36,18 @@ namespace GtkSharp.Generation {
generate = false;
include = true;
continue;
} else if (arg.StartsWith ("--outdir=")) {
include = generate = false;
dir = arg.Substring (9);
continue;
} else if (arg.StartsWith ("--customdir=")) {
include = generate = false;
custom_dir = arg.Substring (12);
continue;
} else if (arg.StartsWith ("--assembly-name=")) {
include = generate = false;
assembly_name = arg.Substring (16);
continue;
}
Parser p = new Parser ();
@ -41,9 +56,16 @@ namespace GtkSharp.Generation {
if (generate)
gens.AddRange (curr_gens);
}
GenerationInfo gen_info = null;
if (dir != "" || assembly_name != "")
gen_info = new GenerationInfo (dir, custom_dir, assembly_name);
foreach (IGeneratable gen in gens) {
gen.Generate ();
if (gen_info == null)
gen.Generate ();
else
gen.Generate (gen_info);
}
ObjectGen.GenerateMappers ();

6
generator/GenerationInfo.cs
View file

@ -27,10 +27,12 @@ namespace GtkSharp.Generation {
assembly_name = ns_name.ToLower () + "-sharp";
}
public GenerationInfo (string dir, string assembly_name)
public GenerationInfo (string dir, string assembly_name) : this (dir, dir, assembly_name) {}
public GenerationInfo (string dir, string custom_dir, string assembly_name)
{
this.dir = dir;
custom_dir = dir;
this.custom_dir = custom_dir;
this.assembly_name = assembly_name;
}

0
gtk/HTMLStream.custom → gtkhtml/HTMLStream.custom
View file

53
gtkhtml/Makefile.in
View file

@ -1,29 +1,42 @@
MCS=mcs
DESTDIR=
INCLUDE_APIS = \
../api/atk-api.xml \
../api/pango-api.xml \
../api/gdk-api.xml \
../api/gdk-symbols.xml \
../api/gtk-symbols.xml \
../api/gtk-api.xml
all: linux
NONINCLUDE_APIS = \
glade-api.xml \
art-api.xml \
gnome-api.xml \
gda-api.xml \
gst-api.xml \
gnomedb-api.xml \
rsvg-api.xml \
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:../gtk/gtk-sharp.dll /r:../gnome/gnome-sharp.dll \
/out:gtkhtml-sharp.dll /recurse:*.cs
linux: gtkhtml-sharp.dll
RUNTIME=mono
gtkhtml-sharp.dll: generated/*.cs
$(MCS) --unsafe -nowarn:0660,0661 --target library \
-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 ../gnome/gnome-sharp.dll \
-o gtkhtml-sharp.dll --recurse '*.cs'
all: gtkhtml-sharp.dll
generated-stamp: gtkhtml-api.xml *.custom ../generator/gapi_codegen.exe
$(RUNTIME) ../generator/gapi_codegen.exe --generate gtkhtml-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkhtml-sharp && touch generated-stamp
gtkhtml-sharp.dll: generated-stamp
$(MCS) --unsafe -nowarn:0660,0661 --target library -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 gtkhtml-sharp.dll --recurse '*.cs'
clean:
rm -f *.dll
rm -f generated-stamp
rm -f gtkhtml-sharp.dll
rm -rf generated
install: all
../mkinstalldirs $(DESTDIR)@prefix@/lib && \
cp gtkhtml-sharp.dll $(DESTDIR)@prefix@/lib
prefix=@prefix@
DESTDIR=
apidir=$(DESTDIR)$(prefix)/share/gapi
libdir=$(DESTDIR)$(prefix)/lib
install: all
../mkinstalldirs $(apidir) && \
cp gtkhtml-api.xml $(apidir) && \
cp gtkhtml-sharp.dll $(libdir)

0
api/gtkhtml-api.xml → gtkhtml/gtkhtml-api.xml
View file

2
sources/gtk-sharp-sources.xml
View file

@ -60,7 +60,7 @@
</namespace>
</library>
</api>
<api filename="../api/gtkhtml-api.xml">
<api filename="../gtkhtml/gtkhtml-api.xml">
<library name="gtkhtml-3.0">
<namespace name="Gtk">
<dir>gtkhtml-3.0.8/src</dir>