X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Fbuild.sh;h=2c436adc5fe423d5b88588a05a10c86d37620089;hb=ab89ec9840fbd976fa2c27966704f4875017d037;hp=e2bf145d3c407db436d7c223103fb682d6a01ae3;hpb=b6e62a6a751d22e7cd11b4586ffbaa15d2ded4ea;p=lttng-ci.git

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index e2bf145..2c436ad 100755
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -69,10 +69,22 @@ verne() {
     [ "$res" -ne "0" ]
 }
 
+# Required parameters
+arch=${arch:-}
+conf=${conf:-}
+build=${build:-}
 
-# Create build directory
-rm -rf "$WORKSPACE/build"
-mkdir -p "$WORKSPACE/build"
+SRCDIR="$WORKSPACE/src/lttng-tools"
+#TMPDIR="$WORKSPACE/tmp"
+PREFIX="$WORKSPACE/build"
+TAPDIR="$WORKSPACE/tap"
+
+
+# Create build and tmp directories
+rm -rf "$PREFIX" "$TAPDIR"
+mkdir -p "$PREFIX" "$TAPDIR"
+
+#export TMPDIR
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"
@@ -84,11 +96,10 @@ UST_LIBS="$WORKSPACE/deps/lttng-ust/build/lib/"
 UST_JAVA="$WORKSPACE/deps/lttng-ust/build/share/java/"
 
 # babeltrace
-BABEL_INCS="$WORKSPACE/deps/babeltrace/build/include/"
+#BABEL_INCS="$WORKSPACE/deps/babeltrace/build/include/"
 BABEL_LIBS="$WORKSPACE/deps/babeltrace/build/lib/"
 BABEL_BINS="$WORKSPACE/deps/babeltrace/build/bin/"
 
-PREFIX="$WORKSPACE/build"
 
 # Set platform variables
 case "$arch" in
@@ -148,12 +159,15 @@ macosx)
 esac
 
 
-# Run bootstrap prior to configure
+# Enter the source directory
+cd "$SRCDIR"
+
+# Run bootstrap in the source directory prior to configure
 ./bootstrap
 
 # Get source version from configure script
-eval `grep '^PACKAGE_VERSION=' ./configure`
-PACKAGE_VERSION=`echo "$PACKAGE_VERSION"| sed 's/\-pre$//'`
+eval "$(grep '^PACKAGE_VERSION=' ./configure)"
+PACKAGE_VERSION=$(echo "$PACKAGE_VERSION"| sed 's/\-pre$//')
 
 
 # Export build flags
@@ -186,30 +200,26 @@ static)
     CONF_OPTS="--enable-static --disable-shared"
     ;;
 
-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"
-    ;;
-
 no-ust)
     echo "Build without UST support"
     CONF_OPTS="$NO_UST"
     ;;
 
-java-agent)
-    echo "Build with Java Agents"
+agents)
+    echo "Enable Java Agents"
     export JAVA_HOME="/usr/lib/jvm/default-java"
     export CLASSPATH="$UST_JAVA/*:/usr/share/java/*"
-    CONF_OPTS="--enable-test-java-agent-all"
-    ;;
+    CONF_OPTS+=" --enable-test-java-agent-all"
 
-python-agent)
-    echo "Build with python agents"
+    echo "Enable Python agents"
     export PYTHONPATH="$UST_PYTHON2:$UST_PYTHON3"
-    CONF_OPTS="--enable-test-python-agent-all"
+    CONF_OPTS+=" --enable-test-python-agent-all"
+
+    echo "Enable 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"
     ;;
 
 relayd-only)
@@ -225,54 +235,77 @@ esac
 
 
 # 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 run 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"
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$WORKSPACE/configure" --prefix="$PREFIX" $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$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
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" ./configure $CONF_OPTS --enable-build-man-pages
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$SRCDIR/configure" $CONF_OPTS --enable-build-man-pages
         $MAKE dist
 
-        mkdir -p "$BUILD_PATH"
+        BUILD_PATH="$(mktemp -d)"
         cp ./*.tar.* "$BUILD_PATH/"
         cd "$BUILD_PATH"
 
         # Ignore level 1 of tar
         $TAR xvf ./*.tar.* --strip 1
 
+        # Build in extracted source tree
         MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$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
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$SRCDIR/configure" $CONF_OPTS --enable-build-man-pages
+        $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
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$NEWSRC_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
+        ;;
+
     *)
-        BUILD_PATH=$WORKSPACE
         echo "Standard tree build"
-        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$WORKSPACE/configure" --prefix="$PREFIX" $CONF_OPTS
+        MAKE=$MAKE BISON="$BISON" YACC="$YACC" CFLAGS="$CFLAGS" "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS
         ;;
 esac
 
 # BUILD!
-$MAKE -j "`$NPROC`" V=1
+$MAKE -j "$($NPROC)" V=1
 $MAKE install
 
 # Run tests
 if [ "$RUN_TESTS" = "yes" ]; then
-    cd tests
+    cd tests || exit 1
 
     # Allow core dumps
     ulimit -c unlimited
@@ -282,11 +315,11 @@ if [ "$RUN_TESTS" = "yes" ]; then
     export PATH="$PATH:$BABEL_BINS"
 
     # Prepare tap output dirs
-    rm -rf "$WORKSPACE/tap"
-    mkdir -p "$WORKSPACE/tap"
-    mkdir -p "$WORKSPACE/tap/unit"
-    mkdir -p "$WORKSPACE/tap/fast_regression"
-    mkdir -p "$WORKSPACE/tap/with_bindings_regression"
+    rm -rf "$TAPDIR"
+    mkdir -p "$TAPDIR"
+    mkdir -p "$TAPDIR/unit"
+    mkdir -p "$TAPDIR/fast_regression"
+    mkdir -p "$TAPDIR/with_bindings_regression"
 
     # Force the lttng-sessiond path to /bin/true to prevent the spawing of a
     # lttng-sessiond --daemonize on "lttng create"
@@ -297,10 +330,10 @@ if [ "$RUN_TESTS" = "yes" ]; then
         # Run 'unit_tests', 2.8 and up has a new test suite
         if vergte "$PACKAGE_VERSION" "2.8"; then
             make check
-            rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*'" $BUILD_PATH/tests/" "$WORKSPACE/tap"
+            rsync -a --exclude 'test-suite.log' --include '*/' --include '*.log' --exclude='*'" $BUILD_PATH/tests/" "$TAPDIR"
         else
-            prove --merge -v --exec '' - < "$BUILD_PATH/tests/unit_tests" --archive "$WORKSPACE/tap/unit/" || true
-            prove --merge -v --exec '' - < "$BUILD_PATH/tests/fast_regression" --archive "$WORKSPACE/tap/fast_regression/" || true
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/unit_tests" --archive "$TAPDIR/unit/" || true
+            prove --merge -v --exec '' - < "$BUILD_PATH/tests/fast_regression" --archive "$TAPDIR/fast_regression/" || true
         fi
     else
         # Regression is disabled for now, we need to adjust the testsuite for no ust builds.
@@ -309,14 +342,14 @@ if [ "$RUN_TESTS" = "yes" ]; then
 
     # Run 'with_bindings_regression' test suite for 'python-bindings' config
     if [ "$conf" = "python-bindings" ]; then
-        prove --merge -v --exec '' - < "$WORKSPACE/tests/with_bindings_regression" --archive "$WORKSPACE/tap/with_bindings_regression/" || true
+        prove --merge -v --exec '' - < "$BUILD_PATH/tests/with_bindings_regression" --archive "$TAPDIR/with_bindings_regression/" || true
     fi
 
     # TAP plugin is having a hard time with .yml files.
-    find "$WORKSPACE/tap" -name "meta.yml" -exec rm -f {} \;
+    find "$TAPDIR" -name "meta.yml" -exec rm -f {} \;
 
     # And also with files without extension, so rename all result to *.tap
-    find "$WORKSPACE/tap/" -type f -exec mv {} {}.tap \;
+    find "$TAPDIR/" -type f -exec mv {} {}.tap \;
 
     cd -
 fi
@@ -325,15 +358,15 @@ fi
 $MAKE clean
 
 # Cleanup rpath in executables and shared libraries
-find "$WORKSPACE/build/bin" -type f -perm -0500 -exec chrpath --delete {} \;
-find "$WORKSPACE/build/lib" -name "*.so" -exec chrpath --delete {} \;
+find "$PREFIX/bin" -type f -perm -0500 -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"
+    cd "$SRCDIR"
     rm -rf "$BUILD_PATH"
 fi