diff --git a/doc/haddock.xml b/doc/haddock.xml index de8f02a4203e9deb3a3c478cbc2062705451c700..16b8b05d9f9f816a384ae39464f54f632c4a7fd3 100644 --- a/doc/haddock.xml +++ b/doc/haddock.xml @@ -375,7 +375,7 @@ </listitem> </varlistentry> <varlistentry> - <term><filename>haddock.js</filename></term> + <term><filename>haddock-util.js</filename></term> <listitem> <para>A small piece of JavaScript for collapsing sections of the generated HTML.</para> diff --git a/haddock-ghc.cabal b/haddock-ghc.cabal new file mode 100644 index 0000000000000000000000000000000000000000..b3b91e919a3618f7ea1dffbd10c4534c2fb6636f --- /dev/null +++ b/haddock-ghc.cabal @@ -0,0 +1,101 @@ +build-type: Simple +name: haddock +version: 2.0 +license: BSD3 +license-file: LICENSE +copyright: (c) Simon Marlow, David Waern +author: Simon Marlow, David Waern +maintainer: David Waern <davve@dtek.chalmers.se> +stability: stable +homepage: http://www.haskell.org/haddock/ +synopsis: Haddock is a documentation-generation tool for Haskell + libraries +build-depends: + base, + haskell98, + ghc>=6.8, + Cabal, + filepath, + process, + directory, + pretty, + containers, + array +extensions: CPP, PatternGuards +ghc-options: -fglasgow-exts +hs-source-dirs: src +exposed-modules: Distribution.Haddock +other-modules: + Haddock.Types + Haddock.InterfaceFile + Haddock.Exception +data-files: + html/haddock-DEBUG.css + html/haddock.css + html/haddock.js + html/haskell_icon.gif + html/minus.gif + html/plus.gif +extra-source-files: + CHANGES + README + TODO + doc/Makefile + doc/README + doc/aclocal.m4 + doc/config.mk.in + doc/configure.ac + doc/docbook-xml.mk + doc/fptools.css + doc/haddock.xml + examples/A.hs + examples/B.hs + examples/Bug1.hs + examples/Bug2.hs + examples/Bug3.hs + examples/Bug4.hs + examples/Bug6.hs + examples/Bug7.hs + examples/Bug8.hs + examples/Bug9.hs + examples/Hash.hs + examples/Hidden.hs + examples/Makefile + examples/NoLayout.hs + examples/Test.hs + examples/Visible.hs + examples/hide-bug/A.hs + examples/hide-bug/B.hs + examples/hide-bug/C.hs + examples/hide-bug/D.hs + haddock.spec + haskell.vim + src/haddock.sh + +executable: haddock +hs-source-dirs: src +main-is: Main.hs +extensions: CPP, PatternGuards +ghc-options: -fglasgow-exts -funbox-strict-fields -O2 -fasm +other-modules: + Haddock.Interface.Rename + Haddock.Interface.Create + Haddock.Interface.AttachInstances + Haddock.Utils.FastMutInt2 + Haddock.Utils.BlockTable + Haddock.Utils.Html + Haddock.Utils + Haddock.Backends.HaddockDB + Haddock.Backends.DevHelp + Haddock.Backends.HH + Haddock.Backends.HH2 + Haddock.Backends.Hoogle + Haddock.ModuleTree + Haddock.Types + Haddock.Version + Haddock.InterfaceFile + Haddock.Exception + Haddock.Options + Haddock.GHC.Typecheck + Haddock.GHC.Utils + Haddock.GHC diff --git a/haddock.cabal b/haddock.cabal index b3b91e919a3618f7ea1dffbd10c4534c2fb6636f..c42024363c1354289f43c95c9c759d2eb2e6314c 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,40 +1,21 @@ -build-type: Simple -name: haddock -version: 2.0 -license: BSD3 -license-file: LICENSE -copyright: (c) Simon Marlow, David Waern -author: Simon Marlow, David Waern -maintainer: David Waern <davve@dtek.chalmers.se> -stability: stable -homepage: http://www.haskell.org/haddock/ -synopsis: Haddock is a documentation-generation tool for Haskell - libraries -build-depends: - base, - haskell98, - ghc>=6.8, - Cabal, - filepath, - process, - directory, - pretty, - containers, - array -extensions: CPP, PatternGuards -ghc-options: -fglasgow-exts -hs-source-dirs: src -exposed-modules: Distribution.Haddock -other-modules: - Haddock.Types - Haddock.InterfaceFile - Haddock.Exception +name: haddock +cabal-version: >=1.1.4 +version: 2.0 +license: BSD3 +license-file: LICENSE +copyright: (c) Simon Marlow +author: Simon Marlow +maintainer: Simon Marlow <simonmar@microsoft.com> +stability: stable +homepage: http://www.haskell.org/haddock/ +synopsis: Haddock is a documentation-generation tool for Haskell libraries +build-depends: base>=1.0, haskell98>=1.0, mtl>=1.0, network>=1.0 data-files: - html/haddock-DEBUG.css - html/haddock.css - html/haddock.js - html/haskell_icon.gif - html/minus.gif + html/haddock-DEBUG.css + html/haddock.css + html/haddock.js + html/haskell_icon.gif + html/minus.gif html/plus.gif extra-source-files: CHANGES @@ -72,30 +53,25 @@ extra-source-files: haskell.vim src/haddock.sh -executable: haddock -hs-source-dirs: src -main-is: Main.hs -extensions: CPP, PatternGuards -ghc-options: -fglasgow-exts -funbox-strict-fields -O2 -fasm +executable: haddock-ghc +hs-source-dirs: src +main-is: Main.hs +extensions: CPP, PatternGuards other-modules: - Haddock.Interface.Rename - Haddock.Interface.Create - Haddock.Interface.AttachInstances - Haddock.Utils.FastMutInt2 - Haddock.Utils.BlockTable - Haddock.Utils.Html - Haddock.Utils - Haddock.Backends.HaddockDB - Haddock.Backends.DevHelp - Haddock.Backends.HH - Haddock.Backends.HH2 - Haddock.Backends.Hoogle - Haddock.ModuleTree - Haddock.Types - Haddock.Version - Haddock.InterfaceFile - Haddock.Exception - Haddock.Options - Haddock.GHC.Typecheck - Haddock.GHC.Utils - Haddock.GHC + FastMutInt2 + BlockTable + HaddockDB + HaddockDevHelp + HaddockHH + HaddockHH2 + HaddockHoogle + HaddockHtml + HaddockModuleTree + HaddockRename + HaddockTypes + HaddockUtil + HaddockVersion + Html + GHCUtils + Main + diff --git a/html/haddock.js b/html/haddock-util.js similarity index 100% rename from html/haddock.js rename to html/haddock-util.js diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs index 18a5e831c7185b7fc3c45c271a91c7f4ed0a5c49..b7b215d932be43b5676ba2b4ab3dda624b7c0971 100644 --- a/src/Haddock/Utils.hs +++ b/src/Haddock/Utils.hs @@ -199,7 +199,7 @@ pathJoin = foldr join [] cssFile, iconFile, jsFile, plusFile,minusFile :: String cssFile = "haddock.css" iconFile = "haskell_icon.gif" -jsFile = "haddock.js" +jsFile = "haddock-util.js" plusFile = "plus.gif" minusFile = "minus.gif"