[Gtk2hs-commit] gtk2hs ChangeLog,1.253,1.254 Makefile.am,1.22,1.23

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15296

Modified Files:
	ChangeLog Makefile.am 
Log Message:
make the TypeGenerator tool use an external template file rather than embeding
all the module text. Also added a --parentname parameter to allow modules to
inherit definitions from other modules - this replaces the
'if fname/="Hierarchy" then' hack.
Updated Makefile.am invocations of TypeGenerator correspondingly.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.am	12 Dec 2004 21:57:31 -0000	1.22
+++ Makefile.am	13 Dec 2004 20:22:17 -0000	1.23
@@ -77,6 +77,7 @@
 			    $(srcdir)/tools/hierarchyGen/TypeGenerator
 	$(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \
         $(srcdir)/tools/hierarchyGen/hierarchy.list \
+        $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
         $@ $(addprefix --tag=,$(CREATE_TYPES)))
 
 #
@@ -463,7 +464,9 @@
 		      $(srcdir)/tools/hierarchyGen/TypeGenerator
 		      $(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \
 		      $(srcdir)/tools/hierarchyGen/hierarchy.list \
-		      $@ --tag=libglade --lib=glade --prefix=glade)
+		      $(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
+		      $@ --tag=libglade --lib=glade --prefix=glade \
+		      --parentname=Hierarchy)
 
 am_libHSglade_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSglade_a_SOURCES))))
@@ -521,8 +524,9 @@
 	$(srcdir)/tools/hierarchyGen/TypeGenerator
 	$(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
+	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
 	$@ --tag=gconf --lib=gconf --prefix=gconf \
-	--modname=System.Gnome.GConf.GConfType)
+	--modname=System.Gnome.GConf.GConfType --parentname=Hierarchy)
 
 am_libHSgconf_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSgconf_a_SOURCES))))
@@ -588,7 +592,8 @@
 	$(srcdir)/tools/hierarchyGen/TypeGenerator
 	$(strip $(srcdir)/tools/hierarchyGen/TypeGenerator \
 	$(srcdir)/tools/hierarchyGen/hierarchy.list \
-	$@ --tag=sourceview)
+	$(srcdir)/tools/hierarchyGen/Hierarchy.chs.template \
+	$@ --tag=sourceview --parentname=Hierarchy)
 
 am_libHSsourceview_a_OBJECTS = \
 	$(addsuffix .$(OBJEXT),$(basename $(basename $(libHSsourceview_a_SOURCES))))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- ChangeLog	12 Dec 2004 21:57:31 -0000	1.253
+++ ChangeLog	13 Dec 2004 20:22:16 -0000	1.254
@@ -1,3 +1,16 @@
+2004-12-13 Duncan Coutts <du...@co...>
+
+	* tools/hierarchyGen/TypeGen.hs: make the tool use an external template
+	file rather than embeding all the module text. Also added a
+	--parentname parameter to allow modules to inherit definitions from
+	other modules - this replaces the 'if fname/="Hierarchy" then' hack.
+
+	* tools/hierarchyGen/Hierarchy.chs.template: new file. Template for
+	class hierarchy definition modules. Used by the TypeGenerator program.
+	
+	* Makefile.am: modify invocation of TypeGenerator to pass template file
+	and pass --parentname=Hierarchy for all packages other than gtk.
+
 2004-12-12 Duncan Coutts <du...@co...>
 
 	* gtk/gtk.pkg.in: change package_deps to haskell98 rather than base to