X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Fbabeltrace%2Fbuild.sh;h=2310b3653890630da8bc0b4dfafeafb688ed8baf;hb=c78d77c5ef31f53be100d0fce5d9ea07a5fc8e1d;hp=4aa0cb62000c3515d2ca6908d6c2252a5ef8d5b3;hpb=87e41bca43a0628c7088f2647ebebd41f0ef98cd;p=lttng-ci.git

diff --git a/scripts/babeltrace/build.sh b/scripts/babeltrace/build.sh
index 4aa0cb6..2310b36 100755
--- a/scripts/babeltrace/build.sh
+++ b/scripts/babeltrace/build.sh
@@ -1,6 +1,7 @@
-#!/bin/sh -exu
+#!/bin/bash -exu
 #
 # 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,16 +16,23 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Create build directory
-rm -rf $WORKSPACE/build
-mkdir -p $WORKSPACE/build
+# Required parameters
+arch=${arch:-}
+conf=${conf:-}
+build=${build:-}
 
+
+SRCDIR="$WORKSPACE/src/babeltrace"
+TMPDIR="$WORKSPACE/tmp"
 PREFIX="$WORKSPACE/build"
 
-./bootstrap
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TMPDIR"
+mkdir -p "$PREFIX" "$TMPDIR"
 
-CONF_OPTS=""
+export TMPDIR
 
+# Set platform variables
 case "$arch" in
 solaris10)
     MAKE=gmake
@@ -32,6 +40,7 @@ solaris10)
     NPROC=gnproc
     BISON=bison
     YACC="$BISON -y"
+    export PATH="/opt/csw/bin:/usr/ccs/bin:$PATH"
     ;;
 solaris11)
     MAKE=gmake
@@ -41,6 +50,16 @@ solaris11)
     YACC="$BISON -y"
     export PATH="$PATH:/usr/perl5/bin"
     ;;
+macosx)
+    MAKE=make
+    TAR=tar
+    NPROC="getconf _NPROCESSORS_ONLN"
+    BISON="bison"
+    YACC="$BISON -y"
+    export PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+    export CFLAGS="-I/opt/local/include"
+    export LDFLAGS="-L/opt/local/lib"
+    ;;
 *)
     MAKE=make
     TAR=tar
@@ -50,12 +69,14 @@ solaris11)
     ;;
 esac
 
+# Set configure options for each build configuration
+CONF_OPTS=""
 case "$conf" in
 static)
     echo "Static build"
     CONF_OPTS="--enable-static --disable-shared"
     ;;
-python-bindings)  
+python-bindings)
     echo "Build with python bindings"
     # We only support bindings built with Python 3
     export PYTHON="python3"
@@ -68,6 +89,13 @@ python-bindings)
     ;;
 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
@@ -75,57 +103,70 @@ esac
 #
 # Make sure to move to the build_path and configure
 # before continuing
-
-BUILD_PATH=$WORKSPACE
-TEST_PLAN_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
-		MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
-		;;
-	dist)
-		echo "Distribution out of tree build"
-		BUILD_PATH=`mktemp -d`
-
-		# Initial configure and generate tarball
-		MAKE=$MAKE BISON="$BISON" YACC="$YACC" ./configure
-		$MAKE dist
-
-		mkdir -p $BUILD_PATH
-		cp *.tar.* $BUILD_PATH/
-		cd $BUILD_PATH
-
-		# Ignore level 1 of tar
-		$TAR xvf *.tar.* --strip 1
-
-		MAKE=$MAKE BISON="$BISON" YACC="$YACC" $BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
-
-		# Set test plan to dist tar
-		TEST_PLAN_PATH=$BUILD_PATH
-		;;
-	*)
-		echo "Standard tree build"
-		MAKE=$MAKE BISON="$BISON" YACC="$YACC" $WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
-		;;
+    oot)
+        echo "Out of tree build"
+        BUILD_PATH="$WORKSPACE/oot"
+        mkdir -p "$BUILD_PATH"
+        cd "$BUILD_PATH"
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
+
+    dist)
+        echo "Distribution out of tree build"
+        BUILD_PATH="$(mktemp -d)"
+
+        # Initial configure and generate tarball
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure"
+        $MAKE dist
+
+        mkdir -p "$BUILD_PATH"
+        cp ./*.tar.* "$BUILD_PATH/"
+        cd "$BUILD_PATH"
+
+        # Ignore level 1 of tar
+        $TAR xvf ./*.tar.* --strip 1
+
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
+
+    clang)
+        echo "LLVM clang build"
+        export CC=clang
+        clang -v
+	MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
+    *)
+        echo "Standard in-tree build"
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" "$SRCDIR/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
 esac
 
-$MAKE -j `$NPROC`
+# 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"
+
+# Clean the build directory
 $MAKE clean
 
-# Cleanup rpath and libtool .la files
-#find $WORKSPACE/build/bin -executable -type f -exec chrpath --delete {} \;
-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/bin" -type f -perm -0500 -exec chrpath --delete {} \;
+find "$PREFIX/lib" -name "*.so" -exec chrpath --delete {} \;
+
+# Remove libtool .la files
+find "$PREFIX/lib" -name "*.la" -exec rm -f {} \;
 
-if [ $build = "dist" ]; then
-    cd $WORKSPACE
-    rm -rf $BUILD_PATH
+# Clean temp dir for dist build
+if [ "$build" = "dist" ]; then
+    cd "$SRCDIR"
+    rm -rf "$BUILD_PATH"
 fi
 
 # EOF