Commit 62494e7b authored by Ian Lynagh's avatar Ian Lynagh

Add a hack to make validating with HADDOCK_DOCS=NO work

I've also renamed the bindisttest install directory to contain multiple
spaces, so we are also testing that multiple spaces aren't getting
collapsed into a single space.
parent 1e872802
......@@ -105,6 +105,18 @@ if [ $speed != "FAST" ]; then
$make binary-dist-prep
$make test_bindist TEST_PREP=YES
# This is a hack to make
# HADDOCK_DOCS = NO
# work when validating.
if grep -q "^HADDOCK_DOCS[ ]*=[ ]*NO[ ]*$" mk/validate.mk
then
unset WITH_HADDOCK
DO_HADDOCK=NO
else
WITH_HADDOCK=--with-haddock="$thisdir/$bindistdir/bin/haddock"
DO_HADDOCK=YES
fi
#
# Install the mtl package into the bindist, because it is used by some
# tests. It isn't essential that we do this (the failing tests will
......@@ -115,9 +127,10 @@ if [ $speed != "FAST" ]; then
bindistdir="bindisttest/install dir"
cd libraries/mtl
"$thisdir/$bindistdir/bin/ghc" --make Setup
./Setup configure --with-ghc="$thisdir/$bindistdir/bin/ghc" --with-haddock="$thisdir/$bindistdir/bin/haddock" --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
./Setup configure --with-ghc="$thisdir/$bindistdir/bin/ghc" ${WITH_HADDOCK+"$WITH_HADDOCK"} --global --builddir=dist-bindist --prefix="$thisdir/$bindistdir"
./Setup build --builddir=dist-bindist
./Setup haddock --builddir=dist-bindist
[ "$DO_HADDOCK" = "YES" ] && ./Setup haddock --builddir=dist-bindist
./Setup install --builddir=dist-bindist
./Setup clean --builddir=dist-bindist
rm -f Setup Setup.exe Setup.hi Setup.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment