diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2013-07-09 14:24:10 +0100 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-01-12 14:48:35 -0600 |
| commit | bb6cef20b82ef7a7f2d49f3ef6dc1a7ce880b5f0 (patch) | |
| tree | ea07b1d4ab43169bc8d7074ff05bf1792c93feb0 /haddock.cabal | |
| parent | c1228df0339d041b455bb993786a9ed6322c5e01 (diff) | |
One pass parser and tests.
We remove the HTML test as it is no longer necessary. We cover the
test case in spec tests and other HTML tests but keeping this around
fails: this is because the new parser has different semantics there.
In fact, I suspect the original behaviour was a bug that wasn't
caught/fixed but simply included as-is during the testing.
Diffstat (limited to 'haddock.cabal')
| -rw-r--r-- | haddock.cabal | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/haddock.cabal b/haddock.cabal index d61c78c5..8067db7c 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -69,8 +69,7 @@ executable haddock ghc-options: -funbox-strict-fields -Wall -fwarn-tabs else ghc-options: -funbox-strict-fields -Wall -fwarn-tabs -O2 - if !flag(in-ghc-tree) - build-tools: alex >= 3, happy >= 1.18 + build-depends: base >= 4.3 && < 4.8 if flag(in-ghc-tree) @@ -105,8 +104,8 @@ executable haddock Haddock.Interface.AttachInstances Haddock.Interface.LexParseRn Haddock.Interface.ParseModuleHeader - Haddock.Lex - Haddock.Parse + Haddock.Parser + Haddock.Utf8 Haddock.Utils Haddock.Backends.Xhtml Haddock.Backends.Xhtml.Decl @@ -129,10 +128,7 @@ executable haddock Haddock.Convert else build-depends: haddock - -- In a GHC tree - in particular, in a source tarball - we don't - -- require alex or happy - if !flag(in-ghc-tree) - build-tools: alex >= 3, happy >= 1.18 + library default-language: Haskell2010 @@ -179,8 +175,8 @@ library Haddock.Interface.AttachInstances Haddock.Interface.LexParseRn Haddock.Interface.ParseModuleHeader - Haddock.Lex - Haddock.Parse + Haddock.Parser + Haddock.Utf8 Haddock.Utils Haddock.Backends.Xhtml Haddock.Backends.Xhtml.Decl @@ -221,16 +217,6 @@ test-suite latex-test build-depends: base, directory, process, filepath, Cabal test-suite spec - -- NOTE: As of this writing, Cabal does not properly handle alex/happy for - -- test suites. We work around this by adding dist/build to hs-source-dirs, - -- so that the the generated lexer/parser from the library is used. In - -- addition we depend on 'haddock', so that the library is compiled before - -- the test suite. - -- - -- The corresponding cabal ticket is here: - -- https://github.com/haskell/cabal/issues/943 - hs-source-dirs: - dist/build type: exitcode-stdio-1.0 default-language: Haskell2010 main-is: Spec.hs @@ -250,6 +236,7 @@ test-suite spec , deepseq , array , hspec + , QuickCheck == 2.* build-depends: haddock |