jjb: Add support for python3.10 in build scripts

Change-Id: I9aae281e89602c18970d5e2d9d497a3017e14127
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>

diff --git a/scripts/lttng-analyses/build.sh b/scripts/lttng-analyses/build.sh
index de86ae89e213845f30f851c2bda7b87975741855..8f06e69a1a41d002997385b83559083c3999c5dd 100755 (executable)
--- a/scripts/lttng-analyses/build.sh
+++ b/scripts/lttng-analyses/build.sh
@@ -23,7 +23,7 @@ set -exu
 SRCDIR="src/lttng-analyses"
 
 PYTHON3="python3"
-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]))')
 
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 

diff --git a/scripts/lttng-analyses/pylint.sh b/scripts/lttng-analyses/pylint.sh
index 426fcc4b6632b6a4e01d02ec2d96544281de8d27..7f3ec6e87eb30fc01b987c356cd5a1786afaa92c 100755 (executable)
--- a/scripts/lttng-analyses/pylint.sh
+++ b/scripts/lttng-analyses/pylint.sh
@@ -20,7 +20,7 @@ set -exu
 SRCDIR="src/lttng-analyses"
 
 PYTHON3="python3"
-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]))')
 
 BABELTRACE_DIR=$WORKSPACE/deps/babeltrace/build
 

diff --git a/scripts/lttng-ivc/build.sh b/scripts/lttng-ivc/build.sh
index 08f6b9b8817a11d39074ee86091a31e475994f05..83cbefc291529db55674aa1ab6ce841308cd723d 100644 (file)
--- a/scripts/lttng-ivc/build.sh
+++ b/scripts/lttng-ivc/build.sh
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PYTHON3="python3"
-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]))')
 
 # Tox does not support long path venv for whatever reason.
 PYENV_HOME=$(mktemp -d)

diff --git a/scripts/lttng-tools/build.sh b/scripts/lttng-tools/build.sh
index 945426987f63260fcd6ad535d52b2e459f11536c..b54b6fc0943e04e9683daed12e0a807f7663f9a5 100755 (executable)
--- a/scripts/lttng-tools/build.sh
+++ b/scripts/lttng-tools/build.sh
@@ -275,8 +275,8 @@ cygwin|cygwin64|msys32|msys64)
     PYTHON2=python2
     PYTHON3=python3
 
-    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]))')
 
     DEPS_PYTHON2="$WORKSPACE/deps/build/lib/python$P2_VERSION/site-packages"
     DEPS_PYTHON3="$WORKSPACE/deps/build/lib/python$P3_VERSION/site-packages"

diff --git a/scripts/lttng-tools/release.sh b/scripts/lttng-tools/release.sh
index a199494fdab5b2be6d0d068f0d6671f4947fe5dd..c6e6ce222cb2f4fd55e693fba143bf78ec634db5 100644 (file)
--- a/scripts/lttng-tools/release.sh
+++ b/scripts/lttng-tools/release.sh
@@ -128,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"

diff --git a/scripts/lttng-ust-benchmarks/build.sh b/scripts/lttng-ust-benchmarks/build.sh
index a2799b9d1abf95a36ec01ece0868ce86457ce884..13e6d639d383d5b7e3b34f7c09737dff05feadf8 100644 (file)
--- a/scripts/lttng-ust-benchmarks/build.sh
+++ b/scripts/lttng-ust-benchmarks/build.sh
@@ -25,7 +25,7 @@ rm -rf "$WORKSPACE/build"
 mkdir -p "$WORKSPACE/build"
 
 PYTHON3=python3
-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]))')
 
 # liburcu
 URCU_INCS="$WORKSPACE/deps/liburcu/build/include/"