X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-tools%2Frelease.sh;h=c6e6ce222cb2f4fd55e693fba143bf78ec634db5;hb=2bd4c4ca63118876e21337a6b3d550bf39535d5a;hp=0bd5c5ca9ec8051e4043e415c009f3a1d27d798b;hpb=a7f915c41973179ca5d4d633e63806561a81d753;p=lttng-ci.git

diff --git a/scripts/lttng-tools/release.sh b/scripts/lttng-tools/release.sh
index 0bd5c5c..c6e6ce2 100644
--- a/scripts/lttng-tools/release.sh
+++ b/scripts/lttng-tools/release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -exu
+#!/bin/bash
 #
 # Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
 # Copyright (C) 2020 Michael Jeanson <mjeanson@efficios.com>
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+set -exu
+
 # Version compare functions
 vercomp () {
     set +u
@@ -87,7 +89,7 @@ export CPPFLAGS="-I$DEPS_INC"
 export LDFLAGS="-L$DEPS_LIB"
 
 export JAVA_HOME="/usr/lib/jvm/default-java"
-export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/*"
+export CLASSPATH="$DEPS_JAVA/*:/usr/share/java/log4j-core.jar:/usr/share/java/log4j-1.2.jar"
 
 SRCDIR="$WORKSPACE/src/lttng-tools"
 OUTDIR="$WORKSPACE/out"
@@ -126,8 +128,8 @@ PYTHON3=python3
 export PYTHON="$PYTHON3"
 export PYTHON_CONFIG="/usr/bin/$PYTHON3-config"
 
-P2_VERSION=$($PYTHON2 -c "import sys;print(sys.version[:3])")
-P3_VERSION=$($PYTHON3 -c "import sys;print(sys.version[:3])")
+P2_VERSION=$($PYTHON2 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
+P3_VERSION=$($PYTHON3 -c 'import sys;v = sys.version.split()[0].split("."); print("{}.{}".format(v[0], v[1]))')
 
 UST_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
 UST_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"