Add checking for whether an unpacked directory isnt confused with an older one.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15519 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2007-02-07 14:38:47 +00:00
parent e562e1d2fa
commit 62daca14c9
2 changed files with 14 additions and 0 deletions

View File

@ -79,6 +79,9 @@ function add_to_env() {
fi fi
} }
function assert_one_dir() {
[ -d $@ ] || die "Detected multiple directories where only one was expected; please delete all but the latest one: $@"
}
### Local Variables: *** ### Local Variables: ***
### mode: shell-script *** ### mode: shell-script ***

View File

@ -213,12 +213,14 @@ function inst_autotools() {
else else
wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $AUTOCONF_URL $DOWNLOAD_DIR $TMP_DIR
wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $AUTOMAKE_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/autoconf-*
qpushd $TMP_UDIR/autoconf-* qpushd $TMP_UDIR/autoconf-*
echo "building autoconf..." echo "building autoconf..."
./configure --prefix=$_AUTOTOOLS_UDIR ./configure --prefix=$_AUTOTOOLS_UDIR
make make
make install make install
qpopd qpopd
assert_one_dir $TMP_UDIR/automake-*
qpushd $TMP_UDIR/automake-* qpushd $TMP_UDIR/automake-*
echo "building automake..." echo "building automake..."
./configure --prefix=$_AUTOTOOLS_UDIR ./configure --prefix=$_AUTOTOOLS_UDIR
@ -231,6 +233,7 @@ function inst_autotools() {
echo "libtool/libtoolize already installed. skipping." echo "libtool/libtoolize already installed. skipping."
else else
wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $LIBTOOL_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libtool-*
qpushd $TMP_UDIR/libtool-* qpushd $TMP_UDIR/libtool-*
echo "building libtool..." echo "building libtool..."
./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static ./configure ${HOST_XCOMPILE} --prefix=$_AUTOTOOLS_UDIR --disable-static
@ -263,6 +266,7 @@ function inst_guile() {
smart_wget $SLIB_URL $DOWNLOAD_DIR smart_wget $SLIB_URL $DOWNLOAD_DIR
_SLIB_BALL=$LAST_FILE _SLIB_BALL=$LAST_FILE
tar -xzpf $_GUILE_BALL -C $TMP_UDIR tar -xzpf $_GUILE_BALL -C $TMP_UDIR
assert_one_dir $TMP_UDIR/guile-*
qpushd $TMP_UDIR/guile-* qpushd $TMP_UDIR/guile-*
qpushd ice-9 qpushd ice-9
cp boot-9.scm boot-9.scm.bak cp boot-9.scm boot-9.scm.bak
@ -538,6 +542,7 @@ function inst_libgsf() {
echo "libgsf already installed. skipping." echo "libgsf already installed. skipping."
else else
wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $LIBGSF_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libgsf-*
qpushd $TMP_UDIR/libgsf-* qpushd $TMP_UDIR/libgsf-*
./configure ${HOST_XCOMPILE} \ ./configure ${HOST_XCOMPILE} \
--prefix=$_LIBGSF_UDIR \ --prefix=$_LIBGSF_UDIR \
@ -564,6 +569,7 @@ function inst_goffice() {
rm -rf $TMP_UDIR/goffice-* rm -rf $TMP_UDIR/goffice-*
wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $GOFFICE_URL $DOWNLOAD_DIR $TMP_DIR
mydir=`pwd` mydir=`pwd`
assert_one_dir $TMP_UDIR/goffice-*
qpushd $TMP_UDIR/goffice-* qpushd $TMP_UDIR/goffice-*
[ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \ [ -n "$GOFFICE_PATCH" -a -f "$GOFFICE_PATCH" ] && \
patch -p1 < $GOFFICE_PATCH patch -p1 < $GOFFICE_PATCH
@ -592,6 +598,7 @@ function inst_glade() {
echo "glade already installed. skipping." echo "glade already installed. skipping."
else else
wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $GLADE_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/glade3-*
qpushd $TMP_UDIR/glade3-* qpushd $TMP_UDIR/glade3-*
./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR ./configure ${HOST_XCOMPILE} --prefix=$_GLADE_WFSDIR
make make
@ -626,6 +633,7 @@ function inst_opensp() {
echo "Opensp already installed. Skipping." echo "Opensp already installed. Skipping."
else else
wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $OPENSP_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/OpenSP-*
qpushd $TMP_UDIR/OpenSP-* qpushd $TMP_UDIR/OpenSP-*
[ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \ [ -n "$OPENSP_PATCH" -a -f "$OPENSP_PATCH" ] && \
patch -p0 < $OPENSP_PATCH patch -p0 < $OPENSP_PATCH
@ -654,6 +662,7 @@ function inst_libofx() {
echo "Libofx already installed. Skipping." echo "Libofx already installed. Skipping."
else else
wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $LIBOFX_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/libofx-*
qpushd $TMP_UDIR/libofx-* qpushd $TMP_UDIR/libofx-*
[ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \ [ -n "$LIBOFX_PATCH" -a -f "$LIBOFX_PATCH" ] && \
patch -p0 < $LIBOFX_PATCH patch -p0 < $LIBOFX_PATCH
@ -679,6 +688,7 @@ function inst_gwenhywfar() {
echo "Gwenhywfar already installed. Skipping." echo "Gwenhywfar already installed. Skipping."
else else
wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $GWENHYWFAR_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/gwenhywfar-*
qpushd $TMP_UDIR/gwenhywfar-* qpushd $TMP_UDIR/gwenhywfar-*
./configure \ ./configure \
--with-openssl-includes=$_OPENSSL_UDIR/include \ --with-openssl-includes=$_OPENSSL_UDIR/include \
@ -703,6 +713,7 @@ function inst_aqbanking() {
echo "AqBanking already installed. Skipping." echo "AqBanking already installed. Skipping."
else else
wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR wget_unpacked $AQBANKING_URL $DOWNLOAD_DIR $TMP_DIR
assert_one_dir $TMP_UDIR/aqbanking-*
qpushd $TMP_UDIR/aqbanking-* qpushd $TMP_UDIR/aqbanking-*
./configure \ ./configure \
--with-gwen-dir=${_GWENHYWFAR_UDIR} \ --with-gwen-dir=${_GWENHYWFAR_UDIR} \