From 95679ff90558e0b5309e581ad579dfba663bf4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20K=C3=B6hler?= <andi5.py@gmx.net>
Date: Sat, 28 Apr 2007 11:09:51 +0000
Subject: [PATCH] Add install-fq-mods.bat to dist and start menu.

* Dist new OpenSSL correctly
* cp libssl32.dll ssleay32.dll to make Crypt::SSLeay perl module happy


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16007 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/Makefile.am         |  1 +
 packaging/win32/dist.sh             |  4 ++-
 packaging/win32/gnucash.iss.in      |  1 +
 packaging/win32/install-fq-mods.bat | 47 +++++++++++++++++++++++++++++
 packaging/win32/install.sh          |  1 +
 5 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 packaging/win32/install-fq-mods.bat

diff --git a/packaging/win32/Makefile.am b/packaging/win32/Makefile.am
index 474229cad3..c11d0d85cb 100644
--- a/packaging/win32/Makefile.am
+++ b/packaging/win32/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = \
   functions.sh \
   goffice-0.3.7-patch.diff \
   install.sh \
+  install-fq-mods.bat \
   libofx-0.8.3-patch.diff \
   opensp-1.5.2-patch.diff \
   pi.sh \
diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index a65b36e893..5d62585234 100644
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -36,6 +36,7 @@ function prepare() {
     _GWENHYWFAR_UDIR=`unix_path $GWENHYWFAR_DIR`
     _AQBANKING_UDIR=`unix_path $AQBANKING_DIR`
     _GNUCASH_UDIR=`unix_path $GNUCASH_DIR`
+    _REPOS_UDIR=`unix_path $REPOS_DIR`
     _BUILD_UDIR=`unix_path $BUILD_DIR`
     _INSTALL_UDIR=`unix_path $INSTALL_DIR`
     _INNO_UDIR=`unix_path $INNO_DIR`
@@ -70,7 +71,7 @@ function dist_openssl() {
     setup OpenSSL
     _OPENSSL_UDIR=`unix_path $OPENSSL_DIR`
     mkdir -p $DIST_UDIR/bin
-    cp -a $_OPENSSL_UDIR/bin/lib{eay,ssl}*.dll $DIST_UDIR/bin
+    cp -a $_OPENSSL_UDIR/bin/*.dll $DIST_UDIR/bin
 }
 
 function dist_libxml2() {
@@ -187,6 +188,7 @@ function dist_gnucash() {
     cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
     mkdir -p $DIST_UDIR/share
     cp -a $_INSTALL_UDIR/share/{gnucash,pixmaps,xml} $DIST_UDIR/share
+    cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
     cp -a $_BUILD_UDIR/packaging/win32/gnucash.iss $_GNUCASH_UDIR
 }
 
diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in
index ef7f266aa0..c968068759 100644
--- a/packaging/win32/gnucash.iss.in
+++ b/packaging/win32/gnucash.iss.in
@@ -37,6 +37,7 @@ Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:Addit
 
 [Icons]
 Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\Install Finance-Quote"; Filename: "{app}\bin\install-fq-mods.bat"; WorkingDir: "{app}\bin"; Comment: "Install the necessary perl modules for online retrieval of prices.  Requires ActivePerl 5.8"; Tasks: menuicon
 Name: "{group}\Uninstall GnuCash"; Filename: "{uninstallexe}"; Tasks: menuicon
 Name: "{userdesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
 
diff --git a/packaging/win32/install-fq-mods.bat b/packaging/win32/install-fq-mods.bat
new file mode 100644
index 0000000000..5c42dfebb8
--- /dev/null
+++ b/packaging/win32/install-fq-mods.bat
@@ -0,0 +1,47 @@
+@echo off
+
+if not exist ssleay32.dll (
+  echo.
+  echo Did not find ssleay32.dll in current directory.
+  echo Please start this batch file in the bin directory created by the installer.
+  goto error
+)
+
+echo * Install DateManip
+echo.
+perl -x -S ppm install DateManip
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Install Crypt-SSLeay
+echo.
+set OLDPATH=%PATH%
+set PATH=%CD%;%PATH%
+echo anything | perl -x -S ppm install http://theoryx5.uwinnipeg.ca/ppms/Crypt-SSLeay.ppd
+set errlvlbak=%errorlevel%
+set PATH=%OLDPATH%
+if %errlvlbak% neq 0 goto error
+
+echo.
+echo * Install Finance-Quote
+echo.
+perl -x -S ppm install Finance-Quote
+
+echo.
+echo * Run gnc-fq-check
+echo.
+perl -w gnc-fq-check
+if %errorlevel% neq 0 goto error
+
+echo.
+echo * Installation succeeded
+echo.
+goto end
+
+:error:
+echo.
+echo An error occured, see above.
+echo.
+
+:end
+pause
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index e26b5f750f..5a88920970 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -367,6 +367,7 @@ function inst_openssl() {
             mkdir -p $_OPENSSL_UDIR/lib
             mkdir -p $_OPENSSL_UDIR/include
             cp -a libeay32.dll libssl32.dll $_OPENSSL_UDIR/bin
+            cp -a libssl32.dll $_OPENSSL_UDIR/bin/ssleay32.dll
             for _implib in libeay32 libssl32 ; do
                 cp -a out/$_implib.a $_OPENSSL_UDIR/lib/$_implib.dll.a
             done