r19595 - gnucash/trunk/packaging/win32 - Win32 build: Fix libxslt installation. Improve its calling arguments. Download inno before processing the docs (if the latter fails, we at least have inno).

Christian Stimming cstim at code.gnucash.org
Tue Sep 21 13:09:42 EDT 2010


Author: cstim
Date: 2010-09-21 13:09:42 -0400 (Tue, 21 Sep 2010)
New Revision: 19595
Trac: http://svn.gnucash.org/trac/changeset/19595

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32 build: Fix libxslt installation. Improve its calling arguments. Download inno before processing the docs (if the latter fails, we at least have inno).

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-09-20 20:48:32 UTC (rev 19594)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-09-21 17:09:42 UTC (rev 19595)
@@ -386,7 +386,7 @@
 set_default DOCS_REV "HEAD"
 set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"
 set_default DOCS_DIR $GLOBAL_DIR\\gnucash-docs
-set_default XSLTPROCFLAGS ""
+set_default XSLTPROCFLAGS "--nonet"
 
 set_default ISOCODES_URL "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-3.18.tar.bz2"
 set_default ISOCODES_DIR $GLOBAL_DIR\\isocodes

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-20 20:48:32 UTC (rev 19594)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-21 17:09:42 UTC (rev 19595)
@@ -496,12 +496,18 @@
         wget_unpacked ${LIBXSLT_ICONV_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
         wget_unpacked ${LIBXSLT_ZLIB_URL} ${DOWNLOAD_DIR} ${LIBXSLT_DIR}
         qpushd $_LIBXSLT_UDIR
-            mv libxslt-* mydir
-            cp -r mydir/* .
-            rm -rf mydir
-            mv libxml2-* mydir
-            cp -r mydir/* .
-            rm -rf mydir
+            # The unpacked zips put their content into a directory one
+            # below of where we want them, so we move the content to
+            # the parent directory here.
+            for A in libxslt-* libxml2-* iconv-* zlib-* ; do
+                if [ -d $A ] ; then
+                    mv $A tmpdir
+                    cp -r tmpdir/* .
+                    rm -rf tmpdir
+                else
+                    echo "Oops, $A is not a directory - skipping here."
+                fi
+            done
         qpopd
         quiet which xsltproc || die "libxslt not installed correctly"
     fi
@@ -1476,8 +1482,9 @@
     _CHM_TYPE=$1
     _CHM_LANG=$2
     _XSLTPROC_OPTS=$3
-    echo "Processing $_CHM_TYPE ($_CHM_LANG) ..."
+    echo "\nProcessing $_CHM_TYPE ($_CHM_LANG) ...\n"
     qpushd $_CHM_TYPE/$_CHM_LANG
+        echo "xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml"
         xsltproc $XSLTPROCFLAGS $_XSLTPROC_OPTS ../../../docbook-xsl/htmlhelp/htmlhelp.xsl gnucash-$_CHM_TYPE.xml
         count=0
         echo >> htmlhelp.hhp

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-09-20 20:48:32 UTC (rev 19594)
+++ gnucash/trunk/packaging/win32/install.sh	2010-09-21 17:09:42 UTC (rev 19595)
@@ -107,10 +107,10 @@
  add_step inst_cutecash
 fi
 add_step inst_gnucash
-add_step inst_docs
 if [ "$CROSS_COMPILE" != "yes" ]; then
  add_step inst_inno
 fi
+add_step inst_docs
 add_step inst_finish
 
 # run commands registered with late_eval



More information about the gnucash-changes mailing list