[Gtk2hs-commit] gtk2hs ChangeLog,1.366,1.367 Makefile.am,1.51,1.52

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

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Hierarchy.chs.template: update template to use LGPL
Add '#hide' Haddock annotation so the Types modules will not be included in
the generated documentation.
With the current cvs version of Haddock this makes everything work nicely.

Makefile.am: since hidden modules do not have corresponding html docs
generated for them we need to exclude the hidden modules from the html_DATA
variable.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- Makefile.am	19 Feb 2005 13:25:16 -0000	1.51
+++ Makefile.am	25 Feb 2005 01:20:17 -0000	1.52
@@ -430,6 +430,7 @@
 	gtk/Graphics/UI/Gtk/Embedding/Embedding.hsc
 
 html_HSFILES_PREPROC = gtk/Graphics/UI/Gtk.hs
+html_HSFILES_HIDDEN  = gtk/Graphics/UI/Gtk/Types.hs
 
 gtk_Graphics_UI_Gtk_hs_HCFLAGS			= -fno-warn-duplicate-exports	#FIXME
 gtk_Graphics_UI_Gtk_Gdk_Enums_hs_HCFLAGS	= -fglasgow-exts
@@ -580,6 +581,8 @@
 libHSglade_a_SOURCES =	        \
         glade/Graphics/UI/Gtk/Glade.chs
 
+html_HSFILES_HIDDEN += glade/Graphics/UI/Gtk/Glade/Types.hs
+
 glade_Graphics_UI_Gtk_Glade_Types_hs_HCFLAGS	= -fglasgow-exts
 
 glade/Graphics/UI/Gtk/Glade/Types.chs : $(srcdir)/tools/hierarchyGen/hierarchy.list \
@@ -655,6 +658,8 @@
 	gconf/System/Gnome/GConf/GConfClient.chs	\
 	gconf/System/Gnome/GConf.hs
 
+html_HSFILES_HIDDEN += gconf/System/Gnome/GConf/Types.hs
+
 libHSgconf_a_LIBADD =	\
 	gconf/System/Gnome/GConf/GConfClient_stub.o
 
@@ -743,6 +748,8 @@
 	sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.chs		\
 	sourceview/Graphics/UI/Gtk/SourceView/SourceView.chs
 
+html_HSFILES_HIDDEN += sourceview/Graphics/UI/Gtk/SourceView/Types.hs
+
 sourceview_Graphics_UI_Gtk_SourceView_Types_hs_HCFLAGS	= -fglasgow-exts
 sourceview_Graphics_UI_Gtk_SourceView_SourceTagStyle_hs_HCFLAGS	= -fglasgow-exts
 
@@ -817,6 +824,8 @@
 libHSmozembed_a_SOURCES =				\
 	mozembed/Graphics/UI/Gtk/MozEmbed.chs
 
+html_HSFILES_HIDDEN += mozembed/Graphics/UI/Gtk/MozEmbed/Types.hs
+
 mozembed_Graphics_UI_Gtk_MozEmbed_Types_hs_HCFLAGS = -fglasgow-exts
 
 mozembed/Graphics/UI/Gtk/MozEmbed/Types.chs :	\
@@ -881,7 +890,7 @@
 		$(html_HSFILES_PREPROC:.hs=.hs.uncpp)
 
 html_DATA =									\
-	$(foreach HSFILE, $(html_HSFILES),					\
+	$(foreach HSFILE, $(filter-out $(html_HSFILES_HIDDEN),$(html_HSFILES)),	\
 	    $(patsubst $(firstword $(subst /, ,$(HSFILE))).%.hs, doc/%.html, 	\
 		$(subst /,.,$(HSFILE:.uncpp=))))				\
 	doc/haddock.css doc/haskell_icon.gif					\

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- ChangeLog	25 Feb 2005 01:11:30 -0000	1.366
+++ ChangeLog	25 Feb 2005 01:20:16 -0000	1.367
@@ -118,6 +118,18 @@
 	* gtk/Graphics/UI/Gtk/Windows/Dialog.chs,
 	gtk/Graphics/UI/Gtk/Windows/Window.chs.pp: same for Windows modules.
 
+	* tools/hierarchyGen/Hierarchy.chs.template: update template to use
+	LGPL and add '#hide' Haddock annotation so the Types modules will not
+	be included in the generated documentation. With the current cvs
+	version of Haddock this makes everything work nicely.
+
+	* tools/hierarchyGen/TypeGen.hs: fix templateSubstitute function to
+	cope with escaped '@' symbols.
+
+	* Makefile.am: since hidden modules do not have corresponding html
+	docs generated for them we need to exclude the hidden modules from the
+	html_DATA variable.
+
 2005-02-24 Duncan Coutts <du...@co...>
 
 	* configure.ac: Bump version to 0.9.7.1