X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=babeltrace%2Fbabeltrace-master.sh;h=99417a2701a183b3cad0375773a2e8f207f6928e;hb=aad6ac9072f76adb34d053ba5319e53067ea94c7;hp=8391abe571a6f9f9dcda91a3e3057cb2995819eb;hpb=8a804acc7c9bfa48177a4a88d43d81cbf6ef0f18;p=lttng-ci.git diff --git a/babeltrace/babeltrace-master.sh b/babeltrace/babeltrace-master.sh index 8391abe..99417a2 100755 --- a/babeltrace/babeltrace-master.sh +++ b/babeltrace/babeltrace-master.sh @@ -26,18 +26,57 @@ python_bindings) ;; esac -./configure --prefix=$PREFIX $CONF_OPTS +# Build type +# oot : out-of-tree build +# dist: build via make dist +# * : normal tree build +# +# Make sure to move to the build_path and configure +# before continuing -make +BUILD_PATH=$WORKSPACE +case "$build" in + oot) + echo "Out of tree build" + BUILD_PATH=$WORKSPACE/oot + mkdir -p $BUILD_PATH + cd $BUILD_PATH + $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; + dist) + echo "Distribution out of tree build" + BUILD_PATH=`mktemp -d` + + # Initial configure and generate tarball + ./configure + make dist + + mkdir -p $BUILD_PATH + cp *.tar.* $BUILD_PATH/ + cd $BUILD_PATH + + # Ignore level 1 of tar + tar xvf *.tar.* --strip 1 + + $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS + ;; + *) + BUILD_PATH=$WORKSPACE + echo "Standard tree build" + $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS + ;; +esac + +make V=1 make install rm -rf $WORKSPACE/tap mkdir -p $WORKSPACE/tap -cd $WORKSPACE/tests +cd $BUILD_PATH/tests # Run make check tests -prove --merge --exec '' - < $WORKSPACE/tests/tests --archive $WORKSPACE/tap/ || true +prove --merge --exec '' - < $BUILD_PATH/tests/tests --archive $WORKSPACE/tap/ || true # TAP plugin is having a hard time with .yml files. rm -f $WORKSPACE/tap/meta.yml @@ -51,3 +90,7 @@ make clean find $WORKSPACE/build/bin -executable -type f -exec chrpath --delete {} \; find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \; find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \; + +if [ $build = "dist" ]; then + rm -rf $BUILD_PATH +fi