r18690 - gnucash/trunk/packaging/win32 - Win32: Update libxslt version, but it needs its own copy of libxml2.dll.

[Christian Stimming]

Author: cstim
Date: 2010-02-19 17:12:28 -0500 (Fri, 19 Feb 2010)
New Revision: 18690
Trac: http://svn.gnucash.org/trac/changeset/18690

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Update libxslt version, but it needs its own copy of libxml2.dll.

Apparently the gnome-provided libxml2 has the DLL filename libxml2-2.dll,
but the binary from xmlsoft.org still has the filename libxml2.dll.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-02-19 21:06:50 UTC (rev 18689)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-02-19 22:12:28 UTC (rev 18690)
@@ -153,7 +153,8 @@
 set_default EXETYPE_SCRIPT `pwd`/exetype.pl
 set_default EXETYPE_DIR $TOOLS_DIR
 
-set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/oldreleases/libxslt-1.1.23+.win32.zip"
+set_default LIBXSLT_URL "http://xmlsoft.org/sources/win32/libxslt-1.1.26.win32.zip"
+set_default LIBXSLT_LIBXML2_URL "http://xmlsoft.org/sources/win32/libxml2-2.7.6.win32.zip"
 set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt
 
 set_default LIBXML2_URL "$GNOME_WIN32_DEPS_URL/libxml2_2.7.4-1_win32.zip"

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-02-19 21:06:50 UTC (rev 18689)
+++ gnucash/trunk/packaging/win32/install.sh	2010-02-19 22:12:28 UTC (rev 18690)
@@ -499,10 +499,14 @@
     else
         [ "$CROSS_COMPILE" = "yes" ] && die "xsltproc unavailable"
         wget_unpacked $LIBXSLT_URL $DOWNLOAD_DIR $LIBXSLT_DIR
+        wget_unpacked $LIBXSLT_LIBXML2_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
         qpopd
         quiet which xsltproc || die "libxslt not installed correctly"
     fi