X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Flttng-tools%2Frelease.sh;h=430ab4e59259cf763a27c7112737d9b6c441a3d0;hb=dc56017a15d8f136d3577ab87dfed365f6588d65;hp=a199494fdab5b2be6d0d068f0d6671f4947fe5dd;hpb=00b991d2b3aa497b41425dd7240606c39f6deabd;p=lttng-ci.git diff --git a/scripts/lttng-tools/release.sh b/scripts/lttng-tools/release.sh index a199494..430ab4e 100644 --- a/scripts/lttng-tools/release.sh +++ b/scripts/lttng-tools/release.sh @@ -121,20 +121,17 @@ fi export BABELTRACE_PLUGIN_PATH="$DEPS_LIB/babeltrace2/plugins/" export LIBBABELTRACE2_PLUGIN_PROVIDER_DIR="$DEPS_LIB/babeltrace2/plugin-providers/" -PYTHON2=python2 PYTHON3=python3 # Set default python to python3 for the bindings 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])") +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" -export PYTHONPATH="$UST_PYTHON2:$UST_PYTHON3" +export PYTHONPATH="$UST_PYTHON3" @@ -155,7 +152,7 @@ cd "$SRCDIR" eval "$(grep '^PACKAGE_VERSION=' ./configure)" PACKAGE_VERSION=${PACKAGE_VERSION//\-pre*/} -CONF_OPTS=("--enable-python-bindings" "--enable-test-java-agent-all" "--enable-test-python-agent-all") +CONF_OPTS=("--enable-python-bindings" "--enable-test-java-agent-all" "--enable-test-python3-agent") TARBALL_FILE="lttng-tools-$PACKAGE_VERSION.tar.bz2"