Update of /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27452/tools/hierarchyGen
Modified Files:
Hierarchy.chs.template TypeGen.hs
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: Hierarchy.chs.template
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/Hierarchy.chs.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Hierarchy.chs.template 8 Jan 2005 17:25:05 -0000 1.2
+++ Hierarchy.chs.template 25 Feb 2005 01:20:17 -0000 1.3
@@ -5,20 +5,28 @@
--
-- Author : Axel Simon
--
--- Copyright (c) 2001-2004 Axel Simon
+-- Version $Revision$ from $Date$
--
--- This file is free software; you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
+-- Copyright (C) 2001-2005 Axel Simon
--
--- This file is distributed in the hope that it will be useful,
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public
+-- License as published by the Free Software Foundation; either
+-- version 2.1 of the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--- GNU General Public License for more details.
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
--
+-- #hide
+
-- |
--- This file reflects the Gtk object hierarchy in terms of Haskell classes.
+-- Maintainer : gtk2hs-users\@lists.sourceforge.net
+-- Stability : provisional
+-- Portability : portable (depends on GHC)
+--
+-- This file reflects the Gtk+ object hierarchy in terms of Haskell classes.
--
module @MODULE_NAME@ (
@MODULE_EXPORTS@
@@ -30,7 +38,7 @@
import GHC.Base (unsafeCoerce#)
@IMPORT_PARENT@
-{#context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #}
+{# context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #}
-- The usage of foreignPtrToPtr should be safe as the evaluation will only be
-- forced if the object is used afterwards
Index: TypeGen.hs
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/hierarchyGen/TypeGen.hs,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TypeGen.hs 8 Jan 2005 17:25:05 -0000 1.11
+++ TypeGen.hs 25 Feb 2005 01:20:17 -0000 1.12
@@ -266,6 +266,7 @@
templateSubstitute :: String -> (String -> ShowS) -> ShowS
templateSubstitute template varSubst = doSubst template
where doSubst [] = id
+ doSubst ('\\':'@':cs) = sc '@' . doSubst cs
doSubst ('@':cs) = let (var,_:cs') = span ('@'/=) cs
in varSubst var . doSubst cs'
doSubst (c:cs) = sc c . doSubst cs
|
