r15540 - gnucash/trunk/packaging/win32 - Install.sh: Make some installs silent, fix AqBanking LDFLAGS.

[Andreas Köhler]

Author: andi5
Date: 2007-02-09 16:54:40 -0500 (Fri, 09 Feb 2007)
New Revision: 15540
Trac: http://svn.gnucash.org/trac/changeset/15540

Modified:
   gnucash/trunk/packaging/win32/custom.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Install.sh: Make some installs silent, fix AqBanking LDFLAGS.

msysdtk, unzip, inno and svn can be installed without user
interaction. Replace quick start inno pack by the release package. Do
not remove the LibOFX library dir by overwriting LDFLAGS in the make
call of aqbanking.


Modified: gnucash/trunk/packaging/win32/custom.sh
===================================================================
--- gnucash/trunk/packaging/win32/custom.sh	2007-02-09 21:52:09 UTC (rev 15539)
+++ gnucash/trunk/packaging/win32/custom.sh	2007-02-09 21:54:40 UTC (rev 15540)
@@ -166,7 +166,7 @@
 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_URL="http://files.jrsoftware.org/is/5/isetup-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"

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-02-09 21:52:09 UTC (rev 15539)
+++ gnucash/trunk/packaging/win32/install.sh	2007-02-09 21:54:40 UTC (rev 15540)
@@ -88,8 +88,7 @@
         echo "msys dtk already installed.  skipping."
     else
         smart_wget $DTK_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $MSYS_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$MSYS_DIR"
         for file in \
 	    /bin/{aclocal*,auto*,ifnames,libtool*,guile*} \
 	    /share/{aclocal,aclocal-1.7,autoconf,autogen,automake-1.7,guile,libtool}
@@ -128,8 +127,7 @@
         echo "unzip already installed.  skipping."
     else
         smart_wget $UNZIP_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $UNZIP_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$UNZIP_DIR"
     fi
     quiet unzip --help || die "unzip unavailable"
 }
@@ -621,9 +619,7 @@
         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
+        $LAST_FILE //SP- //SILENT //DIR="$INNO_DIR"
     fi
     quiet which iscc || die "iscc (Inno Setup Compiler) not installed correctly"
 }
@@ -753,27 +749,29 @@
 	    if test x$aqbanking_with_qt = xyes; then
 		inst_qt4
 		_QTDIR=`unix_path ${QTDIR}`
+		_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
 		./configure \
 		    --with-gwen-dir=${_GWENHYWFAR_UDIR} \
 		    --with-frontends="cbanking qbanking" \
 		    --with-backends="aqdtaus aqhbci aqofxconnect" \
 		    CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
-		    LDFLAGS="-L${_LIBOFX_UDIR}/lib" \
+		    LDFLAGS="${_AQ_LDFLAGS}" \
 		    qt3_libs="-L${_QTDIR}/lib -L${_QTDIR}/bin -lQtCore4 -lQtGui4 -lQt3Support4" \
 		    qt3_includes="-I${_QTDIR}/include -I${_QTDIR}/include/Qt -I${_QTDIR}/include/QtCore -I${_QTDIR}/include/QtGui -I${_QTDIR}/include/Qt3Support" \
 		    --prefix=${_AQBANKING_UDIR}
 		make qt4-port
 		make clean
 	    else
-	    ./configure \
-		--with-gwen-dir=${_GWENHYWFAR_UDIR} \
-		--with-frontends="cbanking" \
-		--with-backends="aqdtaus aqhbci aqofxconnect" \
-		CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
-		LDFLAGS="-L${_LIBOFX_UDIR}/lib" \
-	        --prefix=${_AQBANKING_UDIR}
+		_AQ_LDFLAGS="-L${_LIBOFX_UDIR}/lib"
+		./configure \
+		    --with-gwen-dir=${_GWENHYWFAR_UDIR} \
+		    --with-frontends="cbanking" \
+		    --with-backends="aqdtaus aqhbci aqofxconnect" \
+		    CPPFLAGS="-I${_LIBOFX_UDIR}/include" \
+		    LDFLAGS="${_AQ_LDFLAGS}" \
+	            --prefix=${_AQBANKING_UDIR}
 	    fi
-	    make LDFLAGS="${LDFLAGS} -no-undefined"
+	    make LDFLAGS="${_AQ_LDFLAGS} -no-undefined"
 	    make install
 	qpopd
     fi
@@ -789,8 +787,7 @@
         echo "subversion already installed.  skipping."
     else
         smart_wget $SVN_URL $DOWNLOAD_DIR
-        echo "!!! When asked for an installation path, specify $SVN_DIR !!!"
-        $LAST_FILE
+        $LAST_FILE //SP- //SILENT //DIR="$SVN_DIR"
     fi
 }