diff options
| author | Tamar Christina <tamar@zhox.com> | 2015-10-31 18:12:42 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2015-10-31 18:12:42 +0100 |
| commit | 6bef55c6b561080c5ddff73f2c501e40acee86ef (patch) | |
| tree | dbf2a1960b7f2e39d8d02cfdfd52571dd5f5aca5 | |
| parent | 7a48e6caad54609f1bbefc3bd60e8352edcd2cc7 (diff) | |
| download | haskell-6bef55c6b561080c5ddff73f2c501e40acee86ef.tar.gz | |
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
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | utils/mkUserGuidePart/Main.hs | 7 |
2 files changed, 17 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 82524b8de1..65e5d77829 100644 --- a/configure.ac +++ b/configure.ac @@ -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 ]) diff --git a/utils/mkUserGuidePart/Main.hs b/utils/mkUserGuidePart/Main.hs index 9bc8caa216..dd72c270d5 100644 --- a/utils/mkUserGuidePart/Main.hs +++ b/utils/mkUserGuidePart/Main.hs @@ -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 |