Author: jfrederic.clere(a)jboss.com Date: 2008-03-06 06:42:57 -0500 (Thu, 06 Mar 2008) New Revision: 1424 Modified: trunk/build/unix/build.sh trunk/build/unix/buildtest.rhel-httpd.sh Log: Add a logic to build from the "tarball" and arrange build.sh Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2008-03-05 18:03:29 UTC (rev 1423) +++ trunk/build/unix/build.sh 2008-03-06 11:42:57 UTC (rev 1424) @@ -117,15 +117,15 @@ # package-version-src-ssl (where package is jboss-blalbla). if [ -d srclib ]; then package_list=${build_top}/package.list - PACKAGE=`basename ${build_top} | awk -F - '{ print $1 "-" $2 }'` has_package=true has_version=true TYPE=`basename ${build_top} | awk -F - '{ print $NF }'` if [ $TYPE = "src" ]; then build_version=`basename ${build_top} | awk -F - '{ print $(NF-1) }'` else - build_version=`basename ${build_top} | awk -F - '{ print $(NF-3) "-" $(NF-2) }'` + build_version=`basename ${build_top} | awk -F - '{ print $(NF-2) }'` fi + PACKAGE=`basename ${build_top} | awk -F"-$build_version" '{ print $1 }'` echo "build_version : $build_version" echo "PACKAGE : $PACKAGE" fi @@ -1101,8 +1101,24 @@ # create a chrootable environment for testing: if [ ! -d ${TMPROOTBASE}/${package_output_dir} ]; then override ${build_top}/util/buildroot ${TMPROOTBASE}/${package_output_dir} + if [ $? -ne 0 ]; then + echo "buildroot ${TMPROOTBASE}/${package_output_dir} failed" + exit 1 + fi fi # run a test override ${build_top}/buildtest.${PACKAGE}.sh ${TMPROOTBASE} ${package_output_dir} ${build_cache_dir} ${IPLOCAL} ${has_ssl} + if [ $? -ne 0 ]; then + echo "buildtest.${PACKAGE} ${TMPROOTBASE} failed" + exit 1 + + # try to build from the source tarball + override ${build_top}/util/buildfromtar ${TMPROOTBASE}/src ${build_output_dir} ${package_src_name} ${BUILD_WIN} ${has_ssl} ${build_version} ${PACKAGE} + if [ $? -ne 0 ]; then + echo "buildfromtar in ${TMPROOTBASE}/src failed" + exit 1 fi +echo "" +echo "SUCCESS : `basename $0` $LastChangedDate$" +echo "" Modified: trunk/build/unix/buildtest.rhel-httpd.sh =================================================================== --- trunk/build/unix/buildtest.rhel-httpd.sh 2008-03-05 18:03:29 UTC (rev 1423) +++ trunk/build/unix/buildtest.rhel-httpd.sh 2008-03-06 11:42:57 UTC (rev 1424) @@ -35,6 +35,10 @@ IPLOCAL=$4 loc_has_ssl=$5 +echo "" +echo "Running : `basename $0` $LastChangedDate$" +echo "" + # Install jboss (as) util/installjboss.sh $base $root $build_cache_dir @@ -104,8 +108,12 @@ sudo kill -15 $pid fi sleep 30 -curl -v http://${IPLOCAL} +curl -v http://${IPLOCAL} if [ $? -eq 0 ]; then echo "Test FAILED can't stop" exit 1 fi +echo "" +echo "SUCCESS : `basename $0` $LastChangedDate$" +echo "" +exit 0