diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal.in (renamed from libraries/template-haskell/template-haskell.cabal) | 6 | ||||
| -rw-r--r-- | testsuite/tests/haddock/haddock_testsuite/all.T | 8 | ||||
| m--------- | utils/haddock | 0 |
5 files changed, 12 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index b205b2441e..f56f6caedb 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/configure.ac b/configure.ac index e269b969bd..a0b3d890cd 100644 --- a/configure.ac +++ b/configure.ac @@ -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], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) +AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.9], [glasgow-haskell-bugs@haskell.org], [ghc-AC_PACKAGE_VERSION]) # Set this to YES for a released version, otherwise NO : ${RELEASE=NO} @@ -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 diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal.in index cdb60c4709..d689af1f75 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal.in @@ -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 @@ -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 diff --git a/testsuite/tests/haddock/haddock_testsuite/all.T b/testsuite/tests/haddock/haddock_testsuite/all.T index 1aa387b6b4..df7dc749d9 100644 --- a/testsuite/tests/haddock/haddock_testsuite/all.T +++ b/testsuite/tests/haddock/haddock_testsuite/all.T @@ -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']) diff --git a/utils/haddock b/utils/haddock -Subproject edd500da16e44e3b211cbf3cb354db99a61f021 +Subproject 1a4715b2c14d6387da91e74560845fb6cbe6808 |