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

ChangeLog

@@ -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>
 
 	* generator/EnumGen.cs : Open stream Create only.

atk/.cvsignore

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

atk/makefile

@@ -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."

gdk/.cvsignore

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

gdk/makefile

@@ -4,7 +4,7 @@ all:
 	@echo "'make unix' is broken for now."
 
 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:
 	@echo "'make unix' is broken for now."

generator/.cvsignore

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

generator/EnumGen.cs

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

generator/ObjectGen.cs

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

generator/StructGen.cs

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

glib/.cvsignore

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

gtk/.cvsignore

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

gtk/makefile

@@ -3,7 +3,7 @@ all:
 	@echo "'make unix' is broken for now."
 
 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:
 	@echo "'make unix' is broken for now."

makefile

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

pango/.cvsignore

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

parser/gapi2xml.pl

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

sample/.cvsignore

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