diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2016-06-17 13:07:51 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2016-06-30 20:49:40 +0200 |
| commit | 693b9ac03060e0c94bf414fab49a0557bcec5c70 (patch) | |
| tree | 4c4076de8387c25f3d4275c20b1e168545051d57 | |
| parent | a9993ac8152c0f8bf18b7cbae8fd11592d841ff0 (diff) | |
enable build from tarball
Tested-and-Reviewed-by: Mike Holmes <mike.holmes@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
| -rwxr-xr-x | apply-and-build.sh | 7 | ||||
| -rwxr-xr-x | build.sh | 9 | ||||
| -rw-r--r-- | helper/generic | 16 |
3 files changed, 32 insertions, 0 deletions
diff --git a/apply-and-build.sh b/apply-and-build.sh index a58de00..4819362 100755 --- a/apply-and-build.sh +++ b/apply-and-build.sh @@ -3,6 +3,8 @@ ROOT_DIR=$(readlink -e $(dirname $0)) cd ${ROOT_DIR} +export CHECK_TARBALL="${CHECK_TARBALL:-1}" + source ${ROOT_DIR}/helper/generic source ${ROOT_DIR}/helper/toolchain source ${ROOT_DIR}/helper/openssl @@ -136,6 +138,11 @@ build_test() dryrun do_configure ".." ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${CONFIGURE_FLAGS} ${M32_CC} ${M32_LD} >> ${logfile_basename}-bootstrap-newdir.log 2>&1 dryrun make -j ${NUM_CPUS} >> ${logfile_basename}-make-newdir.log 2>&1 dryrun popd > /dev/null + + if [[ ${CHECK_TARBALL} -eq 1 ]]; then + dryrun build_from_tarball "." ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${CONFIGURE_FLAGS} ${M32_CC} ${M32_LD} 2>&1 |tee ${logfile_basename}-tarball.log > /dev/null 2>&1 + fi + fi popd > /dev/null } @@ -128,6 +128,13 @@ cleanup_exit() ###### # Main execution +if [[ ${CHECK_TARBALL} -eq 1 ]]; then + ENABLE_NETMAP_PKTIO=1 + ENABLE_IPC_PKTIO=1 + DOXYGEN_HTML=1 + USER_HTML=1 +fi + display_os prepare_platform @@ -201,6 +208,8 @@ git log -1 --oneline > ${ROOT_DIR}/${PLATFORM}-git-describe if [[ -n ${COV_DIR} ]]; then coverity_build +elif [[ ${CHECK_TARBALL} -eq 1 ]]; then + build_from_tarball "." ${GPLATFORM} ${DSTDIR} ${CROSS_HOST} ${CONFIGURE_FLAGS} ${M32_CC} ${M32_LD} elif [[ ${UNTESTED} -eq 1 ]]; then if [[ -z ${ARCH} ]]; then diff --git a/helper/generic b/helper/generic index af4d840..6414ce3 100644 --- a/helper/generic +++ b/helper/generic @@ -11,6 +11,7 @@ export HELPER_TEST="${HELPER_TEST:-1}" export EXAMPLE_TEST="${EXAMPLE_TEST:-1}" export GLOBAL_DSTDIRPATH="$ROOT_DIR/new-build" export DSTDIR="--prefix=${GLOBAL_DSTDIRPATH}" +export CHECK_TARBALL="${CHECK_TARBALL:-0}" if [[ ${PERF_TEST} -eq 1 ]]; then export CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --enable-test-perf" @@ -56,6 +57,7 @@ common_usage() { echo -e "\tHELPER_TEST:\t helper test, default: 1" echo -e "\tEXAMPLE_TEST:\t example test, default: 1" echo -e "\tDISTCHECK:\t set to 1 to enable DISTCHECK build, default: 1" + echo -e "\tCHECK_TARBALL:\t set to 1 to enable CHECK_TARBALL build, default: 0" echo -e "\tINSTALLCHECK:\t set to 1 to enable INSTALLCHECK build, default: 0" echo -e "\tSUDO:\t\t set to 1 to enable sudo before make check, default: 0" } @@ -164,4 +166,18 @@ do_configure() { ${path}/configure ${args} } +build_from_tarball() { + make dist + tar xzf opendataplane-*.tar.gz -C ${BUILDDIR} + tar_dir_name=$(find ${BUILDDIR} -type d -name 'opendataplane-*') + pushd ${tar_dir_name} >/dev/null + ./bootstrap + do_configure ${1} ${2} ${3} "${4}" ${5} ${6} ${7} + make doxygen-doc + make -C doc + make -j ${NUM_CPUS} + popd >/dev/null + rm -rf ${tar_dir_name} +} + ## vim: set ft=sh sw=4 sts=4 et foldmethod=syntax : ## |