IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Win32 build: Fix libxslt installation. Improve its calling arguments. Download inno before processing the docs (if the latter fails, we at least have inno).

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19595 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2010-09-21 17:09:42 +00:00
parent 866dbd0aa1
commit f4d1e8ae91
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/win32/defaults.sh
View File

@ -386,7 +386,7 @@ set_default UPDATE_DOCS yes
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

21
packaging/win32/install-impl.sh
View File

@ -496,12 +496,18 @@ function inst_libxslt() {
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 @@ function make_chm() {
_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

2
packaging/win32/install.sh
View File

@ -107,10 +107,10 @@ if [ "$WITH_CUTECASH" = "yes" ]; then
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