From 4e4375e504948bd068e074b777333455ffbd67a5 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Thu, 21 Dec 2006 14:10:41 +0000 Subject: [PATCH] Add code for download/installation of Inno Setup Compiler, as suggested by hfelton. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15241 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/custom.sh | 6 ++++++ packaging/win32/dist.sh | 4 ++++ packaging/win32/install.sh | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/packaging/win32/custom.sh b/packaging/win32/custom.sh index a88114714d..6f99621328 100644 --- a/packaging/win32/custom.sh +++ b/packaging/win32/custom.sh @@ -156,6 +156,9 @@ GOFFICE_PATCH=`pwd`/goffice-0.3.0-patch.diff GLADE_URL="$GNOME_MIRROR/sources/glade3/3.0/glade3-3.1.2.tar.bz2" GLADE_DIR=$GLOBAL_DIR\\glade +INNO_URL="http://files.jrsoftware.org/ispack/ispack-5.1.9.exe" +INNO_DIR=$GLOBAL_DIR\\inno + SVN_URL="http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe" SVN_DIR=$GLOBAL_DIR\\svn @@ -185,6 +188,9 @@ add_step inst_swig add_step inst_libgsf add_step inst_goffice #add_step inst_glade +if test x$cross_compile != xyes ; then + add_step inst_inno +fi add_step inst_svn add_step svn_up add_step inst_gnucash diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index a3b486d9bb..426dddeb6e 100644 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -141,6 +141,10 @@ function finish() { --install-schema-file $file >/dev/null echo "done" done + + _INNO_UDIR=`unix_path $INNO_DIR` + echo "You can now run the Inno Setup Compiler for creating the setup.exe:" + echo ${_INNO_UDIR}/iscc ${_GNUCASH_UDIR}/packaging/win32/gnucash.iss } prepare diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 721c21450b..b840ba87ad 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -669,6 +669,22 @@ function inst_glade() { quiet glade-3 --version || die "glade not installed correctly" } +function inst_inno() { + setup Inno Setup Compiler + _INNO_UDIR=`unix_path $INNO_DIR` + add_to_env $_INNO_UDIR PATH + if quiet which iscc + then + echo "Inno Setup Compiler already installed. Skipping." + else + smart_wget $INNO_URL $DOWNLOAD_DIR + echo "!!! When asked for the installation path, specify $INNO_DIR !!!" + echo "!!! Also, you can deselect all optional components." + $LAST_FILE + fi + quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly" +} + function inst_svn() { setup Subversion _SVN_UDIR=`unix_path $SVN_DIR` @@ -770,6 +786,7 @@ function inst_gnucash() { } function finish() { + setup Finish... _NEW=x for _ENV in $ENV_VARS; do _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`