From d510c45790432249fe7027b1ed70ce1c06fdd824 Mon Sep 17 00:00:00 2001 From: randen Date: Fri, 1 Jan 2016 18:02:11 -0800 Subject: The Haddock part for fully gcc-like response files " driver/Main.hs * Moved the response file handling into ResponseFile.hs, updating import section as appropriate. * driver/ResponseFile.hs * New file. In anticipation that maybe some day this could be provided by another library, and to make it possible to unit test, this functionality is pulled out of the Main.hs module, and expanded to support the style/format of response files which gcc uses. * The specification for the format of response files which gcc generates and consumes, seems to be best derived from the gcc code itself (libiberty/argv.c), so that is what has been done here. * This is intended to fix haskell/haddock#379 * driver-test/Main.hs * New file for testing code in the driver source tree * driver-test/ResponseFileSpec.hs * Tests, adapted/adopted from the same gcc code where the escaping/unescaping is from, in the hspec style of unit tests * haddock.cabal * Add the driver-test test-suite. Introduces a new library dependency (upon hspec) for the haddock driver target in the haddock.cabal file, but practically, this should not be a problem as the haddock-api tests already depend on hspec. --- haddock.cabal | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'haddock.cabal') diff --git a/haddock.cabal b/haddock.cabal index 71b78347..5fbfa3a0 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -122,6 +122,13 @@ executable haddock else build-depends: haddock-api == 2.16.* +test-suite driver-test + type: exitcode-stdio-1.0 + default-language: Haskell2010 + main-is: Main.hs + hs-source-dirs: driver-test, driver + build-depends: base, hspec + test-suite html-test type: exitcode-stdio-1.0 default-language: Haskell2010 -- cgit v1.2.3 From 116e56e201e2efb52e9ade07deecbcf5f3106719 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 6 Jan 2016 13:37:54 +0100 Subject: Version bumps and changelog --- CHANGES | 12 ++++++++++++ haddock-api/haddock-api.cabal | 2 +- haddock-api/src/Haddock/InterfaceFile.hs | 2 +- haddock-library/haddock-library.cabal | 2 +- haddock.cabal | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) (limited to 'haddock.cabal') diff --git a/CHANGES b/CHANGES index 2cb0a5e0..f3b90e98 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +Changes in version 2.17.0 + + * Included with GHC 8.0.1 + + * Support typesetting of mathematical expressions via Mathjax (#397) + + * Describe orphan instances defined in a module in its documentation (#449) + + * Produce specialized type signatures for typeclass methods (#425) + + * Support GCC-like response files (#470) + Changes in version 2.16.2 * Generate hyperlinked source ourselves (#410, part of GSOC 2015) diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 7835ea50..e1e7480f 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -1,5 +1,5 @@ name: haddock-api -version: 2.16.2 +version: 2.17.0 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs index 5d15fb33..f45589a0 100644 --- a/haddock-api/src/Haddock/InterfaceFile.hs +++ b/haddock-api/src/Haddock/InterfaceFile.hs @@ -82,7 +82,7 @@ binaryInterfaceMagic = 0xD0Cface -- binaryInterfaceVersion :: Word16 #if (__GLASGOW_HASKELL__ >= 711) && (__GLASGOW_HASKELL__ < 801) -binaryInterfaceVersion = 27 +binaryInterfaceVersion = 28 binaryInterfaceVersionCompatibility :: [Word16] binaryInterfaceVersionCompatibility = [binaryInterfaceVersion] diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index f60501f5..e7dd68a3 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -1,5 +1,5 @@ name: haddock-library -version: 1.2.1 +version: 1.4.0 synopsis: Library exposing some functionality of Haddock. description: Haddock is a documentation-generation tool for Haskell libraries. These modules expose some functionality of it diff --git a/haddock.cabal b/haddock.cabal index 007d71d5..2ada188d 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,5 +1,5 @@ name: haddock -version: 2.16.2 +version: 2.17.0 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries -- cgit v1.2.3 From 13e1eaf3ca897ffcf1b37d96e2867bc80d4ca64a Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 6 Jan 2016 08:14:42 -0500 Subject: Add ResponseFile to OtherModules --- haddock.cabal | 2 ++ 1 file changed, 2 insertions(+) (limited to 'haddock.cabal') diff --git a/haddock.cabal b/haddock.cabal index 639b6aaf..1d7a9fee 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -65,6 +65,8 @@ executable haddock transformers other-modules: + ResponseFile, + Documentation.Haddock.Parser Documentation.Haddock.Parser.Monad Documentation.Haddock.Types -- cgit v1.2.3