From 57fd61805fcd13acfd59031fb1211cbfcbb81f51 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 13 Dec 2021 23:33:03 -0500 Subject: [PATCH] * builds/meson/*.py: Fix name of python executable for auxiliary scripts. The previous change to check the return code of `run_command` invocations caused the CI to fail. Although most scripts used `python_exe` as the program command, the script to determine the project version did not. But, all scripts used `python` as the shebang, and this is not available on all systems. Particularly Debian does not provide a `python` command, though `python3` does exist. This meant that formerly the version number was lacking, and now the build simply fails. Instead, rely on `python3` since it is guaranteed to exist when running meson, and `python2` is end of life anyway. --- builds/meson/extract_freetype_version.py | 2 +- builds/meson/extract_libtool_version.py | 2 +- builds/meson/generate_reference_docs.py | 2 +- builds/meson/parse_modules_cfg.py | 2 +- builds/meson/process_ftoption_h.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builds/meson/extract_freetype_version.py b/builds/meson/extract_freetype_version.py index ab79fdb3b..fa83e9d6a 100644 --- a/builds/meson/extract_freetype_version.py +++ b/builds/meson/extract_freetype_version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2020-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/builds/meson/extract_libtool_version.py b/builds/meson/extract_libtool_version.py index 4527f11b2..0ab704eea 100644 --- a/builds/meson/extract_libtool_version.py +++ b/builds/meson/extract_libtool_version.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2020-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/builds/meson/generate_reference_docs.py b/builds/meson/generate_reference_docs.py index 15d9b0660..746518fd4 100644 --- a/builds/meson/generate_reference_docs.py +++ b/builds/meson/generate_reference_docs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2020-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/builds/meson/parse_modules_cfg.py b/builds/meson/parse_modules_cfg.py index aa6e9e176..45b65a55d 100644 --- a/builds/meson/parse_modules_cfg.py +++ b/builds/meson/parse_modules_cfg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2020-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/builds/meson/process_ftoption_h.py b/builds/meson/process_ftoption_h.py index fe6088785..7dfb7c58f 100644 --- a/builds/meson/process_ftoption_h.py +++ b/builds/meson/process_ftoption_h.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Copyright (C) 2020-2021 by # David Turner, Robert Wilhelm, and Werner Lemberg.