[jbossnative-commits] JBoss Native SVN: r1447 - trunk/build/unix.
Author: jfrederic.clere(a)jboss.com
Date: 2008-03-19 04:23:13 -0400 (Wed, 19 Mar 2008)
New Revision: 1447
Modified:
trunk/build/unix/build.sh
Log:
Break the build when one of the "sub" build failed.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-19 08:12:59 UTC (rev 1446)
+++ trunk/build/unix/build.sh 2008-03-19 08:23:13 UTC (rev 1447)
@@ -674,9 +674,11 @@
if [ -f ${apr_common_dir}/include/apr-1/apr.h ]; then
echo "Using cached apr in ${apr_common_dir}"
- return
+ return 0
fi
+ echo ""
echo "Configuring apr-${apr_version} with --prefix=${apr_common_dir}"
+ echo ""
if $BUILD_WIN ; then
(cd ${apr_srcdir}
cp -f include/apr.hw include/apr.h
@@ -690,11 +692,11 @@
)
else
(cd ${apr_srcdir}
- ./configure ${add_conf} --prefix=${apr_common_dir}
+ ./configure ${add_conf} --prefix=${apr_common_dir} || exit 1
echo "Building APR ${apr_version} ..."
- make
- make install
- )
+ make || exit 1
+ make install || exit 1
+ ) || return 1
fi
}
@@ -717,7 +719,9 @@
echo "Using cached apr-util in ${apu_common_dir}"
return
fi
+ echo ""
echo "Configuring apr-util-${apu_version} with --prefix=${apu_common_dir}"
+ echo ""
if $BUILD_WIN ; then
(cd ${apu_srcdir}
cp -f include/apu.hw include/apu.h
@@ -733,11 +737,11 @@
)
else
(cd ${apu_srcdir}
- ./configure ${add_conf} --with-apr=${apu_common_dir} --prefix=${apu_common_dir}
--with-expat=builtin --with-dbm=sdbm
+ ./configure ${add_conf} --with-apr=${apu_common_dir} --prefix=${apu_common_dir}
--with-expat=builtin --with-dbm=sdbm || exit 1
echo "Building APR utilities ${apu_version} ..."
- make
- make install
- )
+ make || exit 1
+ make install || exit 1
+ ) || return 1
fi
}
@@ -758,9 +762,11 @@
if [ -f ${api_common_dir}/include/apr-1/apr_iconv.h ]; then
echo "Using cached apr-iconv in ${api_common_dir}"
- return
+ return 0
fi
+ echo ""
echo "Configuring apr-iconv-${api_version} with --prefix=${api_common_dir}"
+ echo ""
if $BUILD_WIN ; then
(cd ${api_srcdir}
echo "Building APR iconv ${api_version} ..."
@@ -773,11 +779,11 @@
)
else
(cd ${api_srcdir}
- ./configure ${add_conf} --with-apr=${api_common_dir} --prefix=${api_common_dir}
+ ./configure ${add_conf} --with-apr=${api_common_dir} --prefix=${api_common_dir} ||
exit 1
echo "Building APR iconv ${api_version} ..."
- make
- make install
- )
+ make || exit 1
+ make install || exit 1
+ ) || return 1
fi
}
@@ -796,7 +802,9 @@
any_common_dir=${build_common_dir}
fi
+ echo ""
echo "Configuring ${any_srcdir} with --prefix=${any_common_dir}"
+ echo ""
if $BUILD_WIN ; then
(cd ${any_srcdir}
echo "Building in ${any_srcdir} ..."
@@ -816,10 +824,10 @@
else
add_static=""
fi
- ./configure ${add_conf} --prefix=${any_common_dir} ${add_static}
- make
- make install
- )
+ ./configure ${add_conf} --prefix=${any_common_dir} ${add_static} || exit 1
+ make || exit 1
+ make install || exit 1
+ ) || return 1
fi
}
@@ -842,7 +850,9 @@
echo "Using cached zlib in ${zlib_common_dir}"
return
fi
+ echo ""
echo "Configuring zlib-${zlib_version} with --prefix=${zlib_common_dir}"
+ echo ""
if $BUILD_WIN ; then
(cd ${zlib_srcdir}
echo "Building Zlib ${zlib_version} ..."
@@ -861,10 +871,10 @@
else
add_static="--shared"
fi
- ./configure ${add_conf} --prefix=${zlib_common_dir} ${add_static}
- make
- make install
- )
+ ./configure ${add_conf} --prefix=${zlib_common_dir} ${add_static} || exit 1
+ make || exit 1
+ make install || exit 1
+ ) || return 1
fi
}