X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-ust%2Fbuild.sh;h=80488e486d87f956247ce8f165c64317743469f0;hb=8a4d057c3d1c4f31aece3cdae212d6c7acdd6c0b;hp=3b890c28d362a4bd6138e8915ce68ba4bbb1c772;hpb=fe584a390a4ab7e4be80ee28befbf4b1e09f3241;p=lttng-ci.git

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 3b890c2..80488e4 100755
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -1,6 +1,7 @@
 #!/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
@@ -15,27 +16,35 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Required parameters
+arch=${arch:-}
+conf=${conf:-}
+build=${build:-}
 
-# 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=""
+     #BISON="bison"
+     #YACC="$BISON -y"
+     #CFLAGS=""
      ;;
 esac
 
@@ -54,15 +63,13 @@ static)
     CONF_OPTS="--enable-static --disable-shared"
     ;;
 
-java-agent)
-    echo "Java agent build"
+agents)
+    echo "Enable Java agent build"
     export CLASSPATH="/usr/share/java/log4j-1.2.jar"
-    CONF_OPTS="--enable-java-agent-all"
-    ;;
+    CONF_OPTS+=" --enable-java-agent-all --enable-jni-interface"
 
-python-agent)
-    echo "Python agent build"
-    CONF_OPTS="--enable-python-agent"
+    echo "Enable Python agent build"
+    CONF_OPTS+=" --enable-python-agent"
     ;;
 
 *)
@@ -71,84 +78,103 @@ python-agent)
     ;;
 esac
 
+# Enter the source directory
+cd "$SRCDIR"
 
-# Run bootstrap prior to configure
+# Run bootstrap in the source directory prior to configure
 ./bootstrap
 
 
 # Build type
-# oot : out-of-tree build
-# dist: build via make dist
-# *   : normal tree build
+# oot     : out-of-tree build
+# dist    : build via make dist
+# oot-dist: build via make dist out-of-tree
+# *       : normal tree build
 #
 # 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
+
+    mkdir -p "$BUILD_PATH"
+    cd "$BUILD_PATH"
+
+    "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 dist)
-    echo "Distribution out of tree build"
-    BUILD_PATH=`mktemp -d`
+    echo "Distribution tarball in-tree build"
 
     # Initial configure and generate tarball
-    ./configure
+    "$SRCDIR/configure"
     $MAKE dist
 
-    mkdir -p $BUILD_PATH
-    cp *.tar.* $BUILD_PATH/
-    cd $BUILD_PATH
+    BUILD_PATH="$(mktemp -d)"
+    cp ./*.tar.* "$BUILD_PATH/"
+    cd "$BUILD_PATH"
 
     # Ignore level 1 of tar
-    $TAR xvf *.tar.* --strip 1
+    $TAR xvf ./*.tar.* --strip 1
 
-    $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+    # Build in extracted source tree
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+    ;;
+
+oot-dist)
+    echo "Distribution tarball out of tree build"
+    BUILD_PATH="$(mktemp -d)"
+    cd "$BUILD_PATH"
+
+    # Initial configure and generate tarball
+    "$SRCDIR/configure"
+    $MAKE dist
+
+    NEWSRC_PATH="$(mktemp -d)"
+    cp ./*.tar.* "$NEWSRC_PATH/"
+    cd "$NEWSRC_PATH"
+
+    # Ignore level 1 of tar
+    $TAR xvf ./*.tar.* --strip 1
+
+    BUILD_PATH="$(mktemp -d)"
+    cd "$BUILD_PATH"
+
+    # Build oot from extracted sources
+    "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 
 *)
-    BUILD_PATH=$WORKSPACE
-    echo "Standard tree build"
-    $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
+    echo "Standard in-tree build"
+    "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
     ;;
 esac
 
 # BUILD!
-$MAKE -j `$NPROC` V=1
+$MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests
-rm -rf $WORKSPACE/tap
-mkdir -p $WORKSPACE/tap/unit
-
-cd $BUILD_PATH/tests
-
-prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
-
-# TAP plugin is having a hard time with .yml files.
-rm -f $WORKSPACE/tap/unit/meta.yml
+$MAKE check
 
-# And also with files without extension, so rename all result to *.tap
-find $WORKSPACE/tap/unit/ -type f -exec mv {} {}.tap \;
+# Copy tap logs for the jenkins tap parser
+rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
 
-# Cleanup
+# Clean the build directory
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
+find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
 
 # Remove libtool .la files
-find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 
 # Clean temp dir for dist build
 if [ "$build" = "dist" ]; then
-    cd $WORKSPACE
-    rm -rf $BUILD_PATH
+    cd "$SRCDIR"
+    rm -rf "$BUILD_PATH"
 fi
 
 # EOF