Commit 6bef55c6 authored by Tamar Christina's avatar Tamar Christina

Fix documentation build on windows

Summary:
Fix building new Sphinx documenation on Windows in msys2 using Awson's patch on #11021.

Install Sphinx using `pacman -S mingw-w64-$(uname -m)-python2-sphinx`

Test Plan: Apply patch and ./validate

Reviewers: thomie, bgamari, austin

Reviewed By: thomie, bgamari

Subscribers: erikd

Differential Revision: https://phabricator.haskell.org/D1408

GHC Trac Issues: #11021
parent 7a48e6ca
......@@ -725,11 +725,19 @@ then
fi
dnl ** check for Sphinx toolchain
AC_PATH_PROG(SPHINXBUILD,sphinx-build)
AC_CACHE_CHECK([for version of sphinx-build], fp_cv_sphinx_version,
if test "$HostOS" = "mingw32"
then
SphinxBin=sphinx-build2
else
SphinxBin=sphinx-build
fi;
AC_SUBST([SphinxBin])
AC_PATH_PROG(SPHINXBUILD,${SphinxBin})
AC_CACHE_CHECK([for version of ${SphinxBin}], fp_cv_sphinx_version,
changequote(, )dnl
[if test -n "$SPHINXBUILD"; then
fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed 's/Sphinx\( (sphinx-build)\)\? v\?\([0-9]\.[0-9]\.[0-9]\)/\2/' | head -n1`;
fp_cv_sphinx_version=`"$SPHINXBUILD" --version 2>&1 | sed 's/Sphinx\( (sphinx-build[2]\?)\)\? v\?\([0-9]\.[0-9]\.[0-9]\)/\2/' | head -n1`;
fi;
changequote([, ])dnl
])
......
......@@ -7,6 +7,11 @@ import Types hiding (flag)
import Table
import Options
import System.IO
writeFileUtf8 :: FilePath -> String -> IO ()
writeFileUtf8 f txt = withFile f WriteMode (\ hdl -> hSetEncoding hdl utf8 >> hPutStr hdl txt)
-- | A ReStructuredText fragment
type ReST = String
......@@ -27,7 +32,7 @@ usersGuideFile fname = "docs/users_guide/"++fname
writeRestFile :: FilePath -> ReST -> IO ()
writeRestFile fname content =
writeFile fname $ unlines
writeFileUtf8 fname $ unlines
[ ".. This file is generated by utils/mkUserGuidePart"
, ""
, content
......
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