diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 2e74165739..648f2c1dae 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -381,7 +381,8 @@ set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip" set_default CMAKE_DIR $GLOBAL_DIR\\cmake -set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip" +set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.76.1.zip" +set_default DOCBOOK_DTD_URL "http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip" set_default UPDATE_DOCS yes set_default DOCS_REV "HEAD" set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk" diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index e809a5b759..ff24a71a98 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -1493,7 +1493,7 @@ function make_chm() { _XSLTPROC_OPTS=$3 echo "Processing $_CHM_TYPE ($_CHM_LANG) ..." qpushd $_CHM_TYPE/$_CHM_LANG - xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml + xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS --path ../../../docbookx-dtd ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml count=0 echo >> htmlhelp.hhp echo "[ALIAS]" >> htmlhelp.hhp @@ -1518,13 +1518,23 @@ function make_chm() { } function inst_docs() { + setup "Docbook xsl and dtd" _DOCS_UDIR=`unix_path $DOCS_DIR` if [ ! -d $_DOCS_UDIR/docbook-xsl ] ; then wget_unpacked $DOCBOOK_XSL_URL $DOWNLOAD_DIR $DOCS_DIR # add a pause to allow windows to realize that the files now exist sleep 1 mv $_DOCS_UDIR/docbook-xsl-* $_DOCS_UDIR/docbook-xsl + else + echo "Docbook xsl already installed. Skipping." fi + if [ ! -d $_DOCS_UDIR/docbookx-dtd ] ; then + mkdir -p $_DOCS_UDIR/docbookx-dtd + wget_unpacked $DOCBOOK_DTD_URL $DOWNLOAD_DIR $DOCS_DIR/docbookx-dtd + else + echo "Docbook dtd already installed. Skipping." + fi + mkdir -p $_DOCS_UDIR/repos qpushd $DOCS_DIR/repos if [ "$UPDATE_DOCS" = "yes" ]; then