Skip to content

Commit

Permalink
Bump ghc version to 8.9
Browse files Browse the repository at this point in the history
Along the way, I discovered that `template-haskell.cabal` was
hard-coding the GHC version (in the form of its `ghc-boot-th` version
bounds), so I decided to make life a little simpler in the future by
generating `template-haskell.cabal` with autoconf.
  • Loading branch information
RyanGlScott authored and Marge Bot committed Feb 20, 2019
1 parent eda456f commit aa79f65
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ _darcs/
/libraries/plus.gif
/libraries/synopsis.png
/libraries/stamp/
/libraries/template-haskell/template-haskell.cabal
/linter.log
/mk/are-validating.mk
/mk/build.mk
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dnl
# see what flags are available. (Better yet, read the documentation!)
#

AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.7], [[email protected]], [ghc-AC_PACKAGE_VERSION])
AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.9], [[email protected]], [ghc-AC_PACKAGE_VERSION])

# Set this to YES for a released version, otherwise NO
: ${RELEASE=NO}
Expand Down Expand Up @@ -1332,7 +1332,7 @@ checkMake380() {
checkMake380 make
checkMake380 gmake

AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
AC_OUTPUT
[
if test "$print_make_warning" = "true"; then
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
-- WARNING: template-haskell.cabal is automatically generated from template-haskell.cabal.in by
-- ../../configure. Make sure you are editing template-haskell.cabal.in, not
-- template-haskell.cabal.

name: template-haskell
version: 2.15.0.0
-- NOTE: Don't forget to update ./changelog.md
Expand Down Expand Up @@ -52,7 +56,7 @@ Library

build-depends:
base >= 4.11 && < 4.14,
ghc-boot-th == 8.7.*,
ghc-boot-th == @ProjectVersionMunged@,
pretty == 1.1.*

ghc-options: -Wall
Expand Down
8 changes: 4 additions & 4 deletions testsuite/tests/haddock/haddock_testsuite/all.T
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
test('haddockHtmlTest',
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
makefile_test,
['htmlTest'])

test('haddockLatexTest',
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
makefile_test,
['latexTest'])

test('haddockHoogleTest',
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
makefile_test,
['hoogleTest'])

test('haddockHypsrcTest',
[ignore_stdout, unless(in_tree_compiler(), skip), req_haddock],
[ignore_stdout, ignore_stderr, unless(in_tree_compiler(), skip), req_haddock],
makefile_test,
['hypsrcTest'])
2 changes: 1 addition & 1 deletion utils/haddock

0 comments on commit aa79f65

Please sign in to comment.