projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test queue based queuing
[lttng-ci.git]
/
lttng-ust
/
lttng-ust-master.sh
diff --git
a/lttng-ust/lttng-ust-master.sh
b/lttng-ust/lttng-ust-master.sh
index 31a55c41bfda0f2af1ce5c5d15daf1c5277b5e1b..f792c175bf45d86b2b0688f21966aed249a7d291 100755
(executable)
--- a/
lttng-ust/lttng-ust-master.sh
+++ b/
lttng-ust/lttng-ust-master.sh
@@
-48,12
+48,14
@@
esac
BUILD_PATH=$WORKSPACE
case "$build" in
oot)
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)
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
BUILD_PATH=`mktemp -d`
# Initial configure and generate tarball
@@
-71,6
+73,7
@@
case "$build" in
;;
*)
BUILD_PATH=$WORKSPACE
;;
*)
BUILD_PATH=$WORKSPACE
+ echo "Standard tree build"
$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
;;
esac
$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
;;
esac
@@
-99,6
+102,7
@@
make clean
find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
-if [ $build = "dist" ] then
+# Clean temp dir for dist build
+if [ $build = "dist" ]; then
rm -rf $BUILD_PATH
fi
rm -rf $BUILD_PATH
fi
This page took
0.022787 seconds
and
4
git commands to generate.