From 22d1666f864a8c3a718a615ed5b7b88647525caf Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 11 May 2016 20:38:58 +0200 Subject: doc: Add clean targets --- doc/ghc.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/ghc.mk b/doc/ghc.mk index 590d1c5f..02839fe8 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -14,6 +14,8 @@ ifeq "$(BUILD_SPHINX_HTML)" "YES" INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock html : html_utils/haddock/doc + +$(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-*)) endif html_utils/haddock/doc : -- cgit v1.2.3 From 3e087827207f53bc151fe410ef195d1399dcaf22 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Wed, 11 May 2016 22:25:46 +0200 Subject: doc: Add html as an all-target for ghc Otherwise the html documentation won't be installed for binary-dist. --- doc/ghc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ghc.mk b/doc/ghc.mk index 02839fe8..830c3bbc 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -11,11 +11,11 @@ # ----------------------------------------------------------------------------- ifeq "$(BUILD_SPHINX_HTML)" "YES" -INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock - html : html_utils/haddock/doc $(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-*)) +$(eval $(call all-target,utils/haddock/doc,html_utils/haddock/doc)) +INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock endif html_utils/haddock/doc : -- cgit v1.2.3 From 48c63a3a4cd912aedc58b37ea8007c38c55e28ca Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 12 May 2016 09:49:12 +0200 Subject: Update CHANGES --- CHANGES | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f3b90e98..2b92b56d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,11 @@ -Changes in version 2.17.0 +Changes in version 2.17.1 * Included with GHC 8.0.1 + * Fixed Makefile for GHC installation + +Changes in version 2.17.0 (not released) + * Support typesetting of mathematical expressions via Mathjax (#397) * Describe orphan instances defined in a module in its documentation (#449) -- cgit v1.2.3 From 7b238d9c5be9b07aa2d10df323b5c7b8d1634dc8 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 12 May 2016 09:49:38 +0200 Subject: Version bump --- CHANGES | 4 ++++ haddock-api/haddock-api.cabal | 2 +- haddock.cabal | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 2b92b56d..4af801ae 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +Changes in version 2.17.2 + + * TODO + Changes in version 2.17.1 * Included with GHC 8.0.1 diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index cd7a0aa4..6c98fcfb 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -1,5 +1,5 @@ name: haddock-api -version: 2.17.1 +version: 2.17.2 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries diff --git a/haddock.cabal b/haddock.cabal index 9d19571d..5f6e2719 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,5 +1,5 @@ name: haddock -version: 2.17.1 +version: 2.17.2 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries -- cgit v1.2.3 From 67fbe48b9e6830d231b19c3d72960d3e9e137ea0 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 12 May 2016 10:04:27 +0200 Subject: Revert "Version bump" This bump was a bit premature. This reverts commit 7b238d9c5be9b07aa2d10df323b5c7b8d1634dc8. --- CHANGES | 4 ---- haddock-api/haddock-api.cabal | 2 +- haddock.cabal | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 4af801ae..2b92b56d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,3 @@ -Changes in version 2.17.2 - - * TODO - Changes in version 2.17.1 * Included with GHC 8.0.1 diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 6c98fcfb..cd7a0aa4 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -1,5 +1,5 @@ name: haddock-api -version: 2.17.2 +version: 2.17.1 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries diff --git a/haddock.cabal b/haddock.cabal index 5f6e2719..9d19571d 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,5 +1,5 @@ name: haddock -version: 2.17.2 +version: 2.17.1 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries -- cgit v1.2.3 From af1a8689da1990da9a152ae8a0e51976f2a27ff6 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 12 May 2016 10:01:46 +0200 Subject: doc: Fix GHC clean rule Apparently GHC's build system doesn't permit wildcards in clean paths. --- CHANGES | 2 ++ doc/ghc.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2b92b56d..f27d151c 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,8 @@ Changes in version 2.17.1 * Fixed Makefile for GHC installation + * Fixed clean rule of GHC Makefile + Changes in version 2.17.0 (not released) * Support typesetting of mathematical expressions via Mathjax (#397) diff --git a/doc/ghc.mk b/doc/ghc.mk index 830c3bbc..3e53168e 100644 --- a/doc/ghc.mk +++ b/doc/ghc.mk @@ -13,7 +13,7 @@ ifeq "$(BUILD_SPHINX_HTML)" "YES" html : html_utils/haddock/doc -$(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-*)) +$(eval $(call clean-target,utils/haddock/doc,sphinx,utils/haddock/doc/haddock utils/haddock/doc/.build-html utils/haddock/doc/.build-pdf)) $(eval $(call all-target,utils/haddock/doc,html_utils/haddock/doc)) INSTALL_HTML_DOC_DIRS += utils/haddock/doc/haddock endif -- cgit v1.2.3