From 7e38efc0bf42d04945421ccd2778b2c46d3a6194 Mon Sep 17 00:00:00 2001
From: Jake Wheat <jakewheatmail@gmail.com>
Date: Sat, 31 Aug 2019 16:48:51 +0100
Subject: [PATCH] update website build script

---
 website/make_website.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/website/make_website.sh b/website/make_website.sh
index 08e1372..90c6dd4 100755
--- a/website/make_website.sh
+++ b/website/make_website.sh
@@ -5,20 +5,24 @@ set -ex
 # todo: check this is run from the project root and not the website/
 # dir
 
+# todo: put all this in the makefile?
+
+# use make build to get the package database into the right state first
+
 mkdir -p build
 cp website/main.css build
 cp website/ocean.css build
 
 # index
-asciidoctor website/index.asciidoc -o - | runhaskell website/AddLinks.lhs > build/index.html
+asciidoctor website/index.asciidoc -o - | cabal exec runhaskell website/AddLinks.lhs > build/index.html
 
-asciidoctor website/supported_sql.asciidoc -o - | runhaskell website/AddLinks.lhs > build/supported_sql.html
+asciidoctor website/supported_sql.asciidoc -o - | cabal exec runhaskell website/AddLinks.lhs > build/supported_sql.html
 
 # tpch sql file
 # pandoc src/tpch.sql -s --highlight-style kate -o tpch.sql.html
 # rendered test cases
 # build the parserexe target first to fix the package database
-runhaskell -itools website/RenderTestCases.lhs > build/test_cases.asciidoc
+cabal exec runhaskell -- --ghc-arg=-package=pretty-show -itools website/RenderTestCases.lhs > build/test_cases.asciidoc
 
 asciidoctor build/test_cases.asciidoc -o - | \
     sed -e "s/max-width:62\.5em//g" \
@@ -33,4 +37,8 @@ rm build/test_cases.asciidoc
 cabal v2-haddock
 rm -Rf build/haddock
 mkdir build/haddock/
-cp -R dist-newstyle/build/x86_64-linux/ghc-8.6.5/simple-sql-parser-0.5.0/doc/html/simple-sql-parser/* build/haddock/
+
+GHC_VER=$(ghc --numeric-version)
+
+
+cp -R dist-newstyle/build/x86_64-linux/ghc-$GHC_VER/simple-sql-parser-0.6.0/doc/html/simple-sql-parser/* build/haddock/