r19827 - gnucash/trunk/packaging/win32 - Bug #633550 - Help and concepts guide are missing from the prebuilt binary (because xsltproc chokes on undefined entities)

[Geert Janssens]

Author: gjanssens
Date: 2010-11-18 10:33:53 -0500 (Thu, 18 Nov 2010)
New Revision: 19827
Trac: http://svn.gnucash.org/trac/changeset/19827

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Bug #633550 - Help and concepts guide are missing from the prebuilt binary (because xsltproc chokes on undefined entities)

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-11-18 13:19:04 UTC (rev 19826)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-11-18 15:33:53 UTC (rev 19827)
@@ -381,7 +381,8 @@
 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"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-11-18 13:19:04 UTC (rev 19826)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-11-18 15:33:53 UTC (rev 19827)
@@ -1493,7 +1493,7 @@
     _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 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