2002-01-06 Mike Kestner <mkestner@speakeasy.net>

* */makefile : Add atk to the build.
	* generator/EnumGen.cs : Create the generated dir if necessary.
	* generator/ObjectGen.cs : Create the generated dir if necessary.
	* generator/StructGen.cs : Create the generated dir if necessary.
	* parser/gapi2xml.pl : Squash bug in comma separated field defs.

svn path=/trunk/gtk-sharp/; revision=1882
This commit is contained in:
Mike Kestner 2002-01-07 00:25:51 +00:00
parent ca64721a09
commit 8648757e19
17 changed files with 42 additions and 6 deletions

View file

@ -1,3 +1,11 @@
2002-01-06 Mike Kestner <mkestner@speakeasy.net>
* */makefile : Add atk to the build.
* generator/EnumGen.cs : Create the generated dir if necessary.
* generator/ObjectGen.cs : Create the generated dir if necessary.
* generator/StructGen.cs : Create the generated dir if necessary.
* parser/gapi2xml.pl : Squash bug in comma separated field defs.
2002-01-06 Mike Kestner <mkestner@speakeasy.net> 2002-01-06 Mike Kestner <mkestner@speakeasy.net>
* generator/EnumGen.cs : Open stream Create only. * generator/EnumGen.cs : Open stream Create only.

4
atk/.cvsignore Normal file
View file

@ -0,0 +1,4 @@
*.dll
*.exe
generated

10
atk/makefile Normal file
View file

@ -0,0 +1,10 @@
all:
@echo "You must use 'make windows' or 'make unix'."
@echo "'make unix' is broken for now."
windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:atk-sharp.dll /recurse:*.cs
unix:
@echo "'make unix' is broken for now."

View file

@ -1,3 +1,4 @@
*.dll *.dll
*.exe *.exe
generated

View file

@ -4,7 +4,7 @@ all:
@echo "'make unix' is broken for now." @echo "'make unix' is broken for now."
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /out:gdk-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /out:gdk-sharp.dll /recurse:*.cs
unix: unix:
@echo "'make unix' is broken for now." @echo "'make unix' is broken for now."

View file

@ -1,3 +1,4 @@
*.dll *.dll
*.exe *.exe
generated

View file

@ -56,6 +56,9 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) {
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated");
}
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);

View file

@ -49,6 +49,9 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) {
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated");
}
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);

View file

@ -49,6 +49,9 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) {
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated");
}
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);

File diff suppressed because one or more lines are too long

View file

@ -1,3 +1,4 @@
*.dll *.dll
*.exe *.exe
generated

View file

@ -1,4 +1,4 @@
*.dll *.dll
*.exe *.exe
generated.cs generated

View file

@ -3,7 +3,7 @@ all:
@echo "'make unix' is broken for now." @echo "'make unix' is broken for now."
windows: windows:
$(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs $(CSC) /unsafe /target:library /r:../glib/glib-sharp.dll /r:../pango/pango-sharp.dll /r:../atk/atk-sharp.dll /r:../gdk/gdk-sharp.dll /out:gtk-sharp.dll /recurse:*.cs
unix: unix:
@echo "'make unix' is broken for now." @echo "'make unix' is broken for now."

View file

@ -1,4 +1,4 @@
DIRS=generator glib pango gdk gtk sample DIRS=generator glib pango atk gdk gtk sample
ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT))) ROOT=/cygdrive/$(subst \,/,$(subst :\,/,$(SYSTEMROOT)))
CSC=$(ROOT)/microsoft.net/framework/v1.0.2914/csc.exe CSC=$(ROOT)/microsoft.net/framework/v1.0.2914/csc.exe

View file

@ -1,3 +1,4 @@
*.dll *.dll
*.exe *.exe
generated

View file

@ -306,7 +306,7 @@ sub addFieldElems
$elem = addNameElem($parent, 'field', $1); $elem = addNameElem($parent, 'field', $1);
$elem->setAttribute('bits', "$2"); $elem->setAttribute('bits', "$2");
} else { } else {
$elem = addNameElem($parent, 'field', $symb); $elem = addNameElem($parent, 'field', $tok);
} }
$elem->setAttribute('type', "$type"); $elem->setAttribute('type', "$type");
} }

View file

@ -1,3 +1,4 @@
*.dll *.dll
*.exe *.exe
generated