Merge packaging scripts from master branch

[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 6075d96ceb27121e20e243b5ea03dedf0ffa5c5d..f792c175bf45d86b2b0688f21966aed249a7d291 100755 (executable)
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -27,30 +27,57 @@ java-agent)
     export CLASSPATH="/usr/share/java/log4j-1.2.jar"
     CONF_OPTS="--enable-java-agent-all"
     ;;
+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
 
@@ -58,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
 
@@ -74,3 +101,8 @@ 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 {} \;
+
+# Clean temp dir for dist build
+if [ $build = "dist" ]; then
+       rm -rf $BUILD_PATH
+fi