X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=0d8fdaf38f5d9ff0a73143c7bf58418ca48a7e1f;hb=69d7af7199b59d52e623c75d83a665efff0311ce;hp=ba5e0b929fa92a631579a59e4fafbc107e607256;hpb=1ed70cbbe27493eaac1cdd87a50e4566af75e772;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index ba5e0b9..0d8fdaf 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -exu
 #
-# Copyright (C) 2015 - Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
-#               2016 - Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+#               2016-2019 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
@@ -73,19 +73,85 @@ verne() {
 arch=${arch:-}
 conf=${conf:-}
 build=${build:-}
+cc=${cc:-}
 
 
 SRCDIR="$WORKSPACE/src/babeltrace"
 TMPDIR="$WORKSPACE/tmp"
 PREFIX="$WORKSPACE/build"
 
-# Create build and tmp directories
+# The build dir defaults to the source dir
+BUILDDIR="$SRCDIR"
+
+# Create install and tmp directories
 rm -rf "$PREFIX" "$TMPDIR"
 mkdir -p "$PREFIX" "$TMPDIR"
 
 export TMPDIR
 export CFLAGS="-g -O2"
 
+# Set compiler variables
+case "$cc" in
+gcc)
+    export CC=gcc
+    export CXX=g++
+    ;;
+gcc-4.8)
+    export CC=gcc-4.8
+    export CXX=g++-4.8
+    ;;
+gcc-5)
+    export CC=gcc-5
+    export CXX=g++-5
+    ;;
+gcc-6)
+    export CC=gcc-6
+    export CXX=g++-6
+    ;;
+gcc-7)
+    export CC=gcc-7
+    export CXX=g++-7
+    ;;
+gcc-8)
+    export CC=gcc-8
+    export CXX=g++-8
+    ;;
+clang)
+    export CC=clang
+    export CXX=clang++
+    ;;
+clang-3.9)
+    export CC=clang-3.9
+    export CXX=clang++-3.9
+    ;;
+clang-4.0)
+    export CC=clang-4.0
+    export CXX=clang++-4.0
+    ;;
+clang-5.0)
+    export CC=clang-5.0
+    export CXX=clang++-5.0
+    ;;
+clang-6.0)
+    export CC=clang-6.0
+    export CXX=clang++-6.0
+    ;;
+clang-7)
+    export CC=clang-7
+    export CXX=clang++-7
+    ;;
+*)
+    if [ "x$cc" != "x" ]; then
+	    export CC="$cc"
+    fi
+    ;;
+esac
+
+if [ "x${CC:-}" != "x" ]; then
+    echo "Selected compiler:"
+    "$CC" -v
+fi
+
 # Set platform variables
 case "$arch" in
 sol10-i386)
@@ -98,18 +164,18 @@ sol10-i386)
     export CPPFLAGS="-I/opt/csw/include"
     export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
     export PKG_CONFIG_PATH="/opt/csw/lib/pkgconfig"
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
     ;;
 sol11-i386)
     export MAKE=gmake
     export TAR=gtar
     export NPROC=nproc
-    export BISON="/opt/csw/bin/bison"
-    export YACC="$BISON -y"
     export PATH="$PATH:/usr/perl5/bin"
-    export CPPFLAGS="-I/opt/csw/include"
-    export LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib"
-    export LD_ALTEXEC=/usr/sfw/bin/gld
-    export LD=/usr/sfw/bin/gld
+    export LD_ALTEXEC=/usr/bin/gld
+    export LD=/usr/bin/gld
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
     ;;
 macosx)
     export MAKE=make
@@ -120,11 +186,15 @@ macosx)
     export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
     export CFLAGS="$CFLAGS -I/opt/local/include"
     export LDFLAGS="-L/opt/local/lib"
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
     ;;
 *)
     export MAKE=make
     export TAR=tar
     export NPROC=nproc
+    export PYTHON="python3"
+    export PYTHON_CONFIG="python3-config"
     ;;
 esac
 
@@ -137,30 +207,58 @@ cd "$SRCDIR"
 # Get source version from configure script
 eval "$(grep '^PACKAGE_VERSION=' ./configure)"
 
+# Enable dev mode by default for BT 2.0 builds
+export BABELTRACE_DEBUG_MODE=1
+export BABELTRACE_DEV_MODE=1
+export BABELTRACE_MINIMAL_LOG_LEVEL=TRACE
+
 # Set configure options for each build configuration
-CONF_OPTS=""
+CONF_OPTS=()
 case "$conf" in
 static)
-    echo "Static build"
-    CONF_OPTS="--enable-static --disable-shared"
+    echo "Static lib only configuration"
+
+    CONF_OPTS+=("--enable-static" "--disable-shared")
+
     if vergte "$PACKAGE_VERSION" "2.0"; then
-        CONF_OPTS="${CONF_OPTS} --enable-built-in-plugins"
+        CONF_OPTS+=("--enable-built-in-plugins")
     fi
     ;;
+
 python-bindings)
-    echo "Build with python bindings"
-    # We only support bindings built with Python 3
-    export PYTHON="python3"
-    export PYTHON_CONFIG="/usr/bin/python3-config"
-    CONF_OPTS="--enable-python-bindings"
+    echo "Python bindings configuration"
+
+    CONF_OPTS+=("--enable-python-bindings")
 
     if vergte "$PACKAGE_VERSION" "2.0"; then
-        CONF_OPTS="${CONF_OPTS} --enable-python-bindings-doc --enable-python-plugins"
+        CONF_OPTS+=("--enable-python-bindings-doc" "--enable-python-plugins")
     fi
     ;;
+
+prod)
+    echo "Production configuration"
+
+    # Unset the developper variables
+    unset BABELTRACE_DEBUG_MODE
+    unset BABELTRACE_DEV_MODE
+    unset BABELTRACE_MINIMAL_LOG_LEVEL
+
+    # Enable the python bindings
+    CONF_OPTS+=("--enable-python-bindings" "--enable-python-bindings-doc" "--enable-python-plugins")
+    ;;
+
+min)
+    echo "Minimal configuration"
+    ;;
+
 *)
-    echo "Standard build"
-    CONF_OPTS=""
+    echo "Standard configuration"
+
+    # Enable the python bindings / plugins by default with babeltrace2,
+    # the test suite is mostly useless without it.
+    if vergte "$PACKAGE_VERSION" "2.0"; then
+        CONF_OPTS+=("--enable-python-bindings" "--enable-python-plugins")
+    fi
     ;;
 esac
 
@@ -169,56 +267,56 @@ esac
 # dist: build via make dist
 # *   : normal tree build
 #
-# Make sure to move to the build_path and configure
-# before continuing
-BUILD_PATH="$SRCDIR"
+# Make sure to move to the build dir and run configure
+# before continuing.
 case "$build" in
     oot)
         echo "Out of tree build"
-        BUILD_PATH="$WORKSPACE/oot"
-        mkdir -p "$BUILD_PATH"
-        cd "$BUILD_PATH"
-        "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+
+        BUILDDIR="$WORKSPACE/oot"
+        mkdir -p "$BUILDDIR"
+        cd "$BUILDDIR"
+
+        "$SRCDIR/configure" --prefix="$PREFIX" "${CONF_OPTS[@]}"
         ;;
 
     dist)
         echo "Distribution out of tree build"
-        BUILD_PATH="$(mktemp -d)"
+        BUILDDIR="$(mktemp -d)"
 
         # Initial configure and generate tarball
         "$SRCDIR/configure"
         $MAKE dist
 
-        mkdir -p "$BUILD_PATH"
-        cp ./*.tar.* "$BUILD_PATH/"
-        cd "$BUILD_PATH"
+        mkdir -p "$BUILDDIR"
+        cp ./*.tar.* "$BUILDDIR/"
+        cd "$BUILDDIR"
 
         # Ignore level 1 of tar
         $TAR xvf ./*.tar.* --strip 1
 
-        "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+        ./configure --prefix="$PREFIX" "${CONF_OPTS[@]}"
         ;;
 
-    clang)
-        echo "LLVM clang build"
-        export CC=clang
-        clang -v
-	"$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
-        ;;
     *)
         echo "Standard in-tree build"
-        "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+        ./configure --prefix="$PREFIX" "${CONF_OPTS[@]}"
         ;;
 esac
 
+# We are now inside a configured build directory
+
 # BUILD!
 $MAKE -j "$($NPROC)" V=1
 $MAKE install
 
-# Run tests
+# Run tests, don't fail now, we want to run the archiving steps
+set +e
 $MAKE --keep-going check
+ret=$?
+set -e
 
-# Copy tap logs for the jenkins tap parser
+# Copy tap logs for the jenkins tap parser before cleaning the build dir
 rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*' tests/ "$WORKSPACE/tap"
 
 # Clean the build directory
@@ -234,7 +332,10 @@ find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 # Clean temp dir for dist build
 if [ "$build" = "dist" ]; then
     cd "$SRCDIR"
-    rm -rf "$BUILD_PATH"
+    rm -rf "$BUILDDIR"
 fi
 
+# Exit with the return code of the test suite
+exit $ret
+
 # EOF