2002-03-24 Mike Kestner <mkestner@speakeasy.net>

* generator/*Gen.cs : Use Path.DirectorySeparatorChar.
	* generator/Parser.cs : better debug for unexpected types.
	* generator/SymbolTable.cs : Use linux library names.

svn path=/trunk/gtk-sharp/; revision=3308
This commit is contained in:
Mike Kestner 2002-03-24 17:04:25 +00:00
parent 95d51167de
commit 12acb7ff05
10 changed files with 43 additions and 25 deletions

View File

@ -1,7 +1,14 @@
2002-03-24 Mike Kestner <mkestner@speakeasy.net>
* generator/*Gen.cs : Use Path.DirectorySeparatorChar.
* generator/Parser.cs : better debug for unexpected types.
* generator/SymbolTable.cs : Use linux library names.
2002-03-07 Mike Kestner <mkestner@speakeasy.net> 2002-03-07 Mike Kestner <mkestner@speakeasy.net>
* generator/CodeGenerator.cs : Refactor generatable iteration. * generator/CodeGenerator.cs : Refactor generatable iteration.
* generator/SymbolTable.cs : Add Generatables property to expose complex_types.Values. * generator/SymbolTable.cs : Add Generatables property to expose
complex_types.Values.
2002-03-02 Mike Kestner <mkestner@speakeasy.net> 2002-03-02 Mike Kestner <mkestner@speakeasy.net>

View File

@ -34,10 +34,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = dir + sep + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -61,11 +61,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = dir + sep + 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);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -61,10 +61,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = dir + sep + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -61,10 +61,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = dir + sep + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -34,10 +34,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = dir + sep + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -98,7 +98,7 @@ namespace GtkSharp.Generation {
break; break;
default: default:
Console.WriteLine ("Unexpected node."); Console.WriteLine ("Unexpected node named " + def.Name);
break; break;
} }
} }

View File

@ -33,10 +33,12 @@ namespace GtkSharp.Generation {
public void Generate (SymbolTable table) public void Generate (SymbolTable table)
{ {
if (!Directory.Exists("..\\" + ns.ToLower() + "\\generated")) { char sep = Path.DirectorySeparatorChar;
Directory.CreateDirectory("..\\"+ns.ToLower()+"\\generated"); string dir = ".." + sep + ns.ToLower() + sep + "generated";
if (!Directory.Exists(dir)) {
Directory.CreateDirectory(dir);
} }
String filename = "..\\" + ns.ToLower() + "\\generated\\" + Name + ".cs"; String filename = dir + sep + Name + ".cs";
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write); FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream); StreamWriter sw = new StreamWriter (stream);

View File

@ -66,10 +66,10 @@ namespace GtkSharp.Generation {
simple_types.Add ("GParamSpec", "IntPtr"); simple_types.Add ("GParamSpec", "IntPtr");
dlls = new Hashtable(); dlls = new Hashtable();
dlls.Add("Atk", "atk.dll");
dlls.Add("Gdk", "gdk-1.3.dll");
dlls.Add("Gtk", "gtk-1.3.dll");
dlls.Add("Pango", "pango.dll"); dlls.Add("Pango", "pango.dll");
dlls.Add("Atk", "atk.dll");
dlls.Add("Gdk", "gdk-x11-1.3.dll");
dlls.Add("Gtk", "gtk-x11-1.3.dll");
} }
public void AddType (IGeneratable gen) public void AddType (IGeneratable gen)

View File

@ -1,12 +1,12 @@
DIRS=generator glib pango atk 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.3705/csc.exe
all: all:
@echo "You must use 'make windows' or 'make linux'." @echo "You must use 'make windows' or 'make linux'."
@echo "'make unix' is broken for now." @echo "'make unix' is broken for now."
windows: windows:
CSC=$(ROOT)/microsoft.net/framework/v1.0.2914/csc.exe
for i in $(DIRS); do \ for i in $(DIRS); do \
(cd $$i; CSC=$(CSC) make windows) || exit 1;\ (cd $$i; CSC=$(CSC) make windows) || exit 1;\
done; done;