X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust%2Flttng-ust-master.sh;h=be2f31e7da51da382098e1bd154f0d5ccbd3c621;hb=371b695fa77dc68877d4d1384acbcbef9949ec8a;hp=f591c3646009e6c8f8a712c00dee6408ca3bcee1;hpb=394e01b46a0d6a71b0b5a4bfff08640ad75ff7fe;p=lttng-ci.git

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index f591c36..be2f31e 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -30,30 +30,54 @@ java-agent)
 python-agent)
 	echo "Python agent build"
 	CONF_OPTS="--enable-python-agent"
+	;;
 *)
     echo "Standard build"
     CONF_OPTS=""
     ;;
 esac
 
-BUILD_PATH=$WORKSPACE
 # 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
+
+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
 
-$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
 make V=1
 make install
 
@@ -61,7 +85,7 @@ make install
 rm -rf $WORKSPACE/tap
 mkdir -p $WORKSPACE/tap/unit
 
-cd $WORKSPACE/tests
+cd $BUILD_PATH/tests
 
 prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
 
@@ -77,3 +101,7 @@ make clean
 # Cleanup rpath and libtool .la files
 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