X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ust%2Fbuild.sh;h=21094f56bdcb1eca5b9e0cab640c95fb6ff539e8;hb=de41e5b536a225c4cd6f8f0ac90363af5c9a3814;hp=4062e3e0f08f2cc671999dc93138e64cd40c370c;hpb=2b68721ab3a069c3763abf5746a7a8823d804791;p=lttng-ci.git

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 4062e3e..21094f5 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -1,6 +1,7 @@
-#!/bin/sh -exu
+#!/bin/bash -exu
 #
-# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2015, Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+#               2016, Michael Jeanson <mjeanson@efficios.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,45 +17,71 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# Create build directory
-rm -rf $WORKSPACE/build
-mkdir -p $WORKSPACE/build
-
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
 URCU_LIBS="$WORKSPACE/deps/liburcu/build/lib/"
 
+SRCDIR="$WORKSPACE/src/lttng-ust"
+TMPDIR="$WORKSPACE/tmp"
+PREFIX="$WORKSPACE/build"
+
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TMPDIR"
+mkdir -p "$PREFIX" "$TMPDIR"
+
+export TMPDIR
+
+# Set platform variables
+case "$arch" in
+*)
+     MAKE=make
+     TAR=tar
+     NPROC=nproc
+     BISON="bison"
+     YACC="$BISON -y"
+     CFLAGS=""
+     ;;
+esac
+
+# Export build flags
 export CPPFLAGS="-I$URCU_INCS"
 export LDFLAGS="-L$URCU_LIBS"
 export LD_LIBRARY_PATH="$URCU_LIBS:${LD_LIBRARY_PATH:-}"
 
-PREFIX="$WORKSPACE/build"
-
-./bootstrap
 
+# Set configure options for each build configuration
 CONF_OPTS=""
-
 case "$conf" in
-# Unsupported! liblttng-ust can't pull in it's static (.a) dependencies.
-#static)
-#    echo "Static build"
-#    CONF_OPTS="--enable-static --disable-shared"
-#    ;;
+static)
+    # Unsupported! liblttng-ust can't pull in it's static (.a) dependencies.
+    echo "Static build"
+    CONF_OPTS="--enable-static --disable-shared"
+    ;;
+
 java-agent)
     echo "Java agent build"
     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 "Python agent build"
+    CONF_OPTS="--enable-python-agent"
+    ;;
+
 *)
     echo "Standard build"
     CONF_OPTS=""
     ;;
 esac
 
+# Enter the source directory
+cd "$SRCDIR"
+
+# Run bootstrap in the source directory prior to configure
+./bootstrap
+
+
 # Build type
 # oot : out-of-tree build
 # dist: build via make dist
@@ -62,65 +89,63 @@ esac
 #
 # Make sure to move to the build_path and configure
 # before continuing
-
-BUILD_PATH=$WORKSPACE
+BUILD_PATH=$SRCDIR
 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
+oot)
+    echo "Out of tree build"
+    BUILD_PATH=$WORKSPACE/oot
+    mkdir -p $BUILD_PATH
+    cd $BUILD_PATH
+    $SRCDIR/configure --prefix=$PREFIX $CONF_OPTS
+    ;;
 
-make V=1
-make install
+dist)
+    echo "Distribution out of tree build"
+    BUILD_PATH=`mktemp -d`
 
-# Run tests
-rm -rf $WORKSPACE/tap
-mkdir -p $WORKSPACE/tap/unit
+    # Initial configure and generate tarball
+    $SRCDIR/configure
+    $MAKE dist
 
-cd $BUILD_PATH/tests
+    mkdir -p $BUILD_PATH
+    cp *.tar.* $BUILD_PATH/
+    cd $BUILD_PATH
 
-prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+    # Ignore level 1 of tar
+    $TAR xvf *.tar.* --strip 1
 
-# TAP plugin is having a hard time with .yml files.
-rm -f $WORKSPACE/tap/unit/meta.yml
+    $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+    ;;
 
-# And also with files without extension, so rename all result to *.tap
-find $WORKSPACE/tap/unit/ -type f -exec mv {} {}.tap \;
+*)
+    echo "Standard in-tree build"
+    $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+    ;;
+esac
+
+# BUILD!
+$MAKE -j `$NPROC` V=1
+$MAKE install
+
+# Run tests
+$MAKE check
+
+# Copy tap logs for the jenkins tap parser
+rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
 
-# Cleanup
-make clean
+# Clean the build directory
+$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 {} \;
+# Cleanup rpath in executables and shared libraries
+find $PREFIX/lib -name "*.so" -exec chrpath --delete {} \;
+
+# Remove libtool .la files
+find $PREFIX/lib -name "*.la" -exec rm -f {} \;
 
 # Clean temp dir for dist build
-if [ $build = "dist" ]; then
-	rm -rf $BUILD_PATH
+if [ "$build" = "dist" ]; then
+    cd $SRCDIR
+    rm -rf $BUILD_PATH
 fi
+
+# EOF