jjb: Merge java and python agent axis

[lttng-ci.git] / scripts / lttng-ust / build.sh

diff --git a/scripts/lttng-ust/build.sh b/scripts/lttng-ust/build.sh
index 733e9d0ddcb259e822f198d6420a3a301cc53237..80488e486d87f956247ce8f165c64317743469f0 100755 (executable)
--- a/scripts/lttng-ust/build.sh
+++ b/scripts/lttng-ust/build.sh
@@ -63,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"
     ;;
 
 *)
@@ -88,9 +86,10 @@ cd "$SRCDIR"
 
 
 # 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
@@ -99,29 +98,54 @@ 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
     ;;
 
 dist)
-    echo "Distribution out of tree build"
-    BUILD_PATH="$(mktemp -d)"
+    echo "Distribution tarball in-tree build"
 
     # Initial configure and generate tarball
     "$SRCDIR/configure"
     $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
     "$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
+    ;;
+
 *)
     echo "Standard in-tree build"
     "$BUILD_PATH/configure" --prefix="$PREFIX" $CONF_OPTS