recipe: introduce PyProjectRecipe and MesonRecipe

Dockerfile

@@ -57,6 +57,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
         ant \
         autoconf \
         automake \
+        autopoint \
         ccache \
         cmake \
         g++ \
@@ -70,6 +71,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
         make \
         openjdk-17-jdk \
         patch \
+        patchelf \
         pkg-config \
         python3 \
         python3-dev \

doc/source/quickstart.rst

@@ -72,6 +72,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
         ant \
         autoconf \
         automake \
+        autopoint \
         ccache \
         cmake \
         g++ \
@@ -85,6 +86,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
         make \
         openjdk-17-jdk \
         patch \
+        patchelf \
         pkg-config \
         python3 \
         python3-dev \

pythonforandroid/recipe.py

@@ -1,4 +1,4 @@
-from os.path import basename, dirname, exists, isdir, isfile, join, realpath, split, sep
+from os.path import basename, dirname, exists, isdir, isfile, join, realpath, split
 import glob
 
 import hashlib
@@ -843,7 +843,6 @@ class PythonRecipe(Recipe):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
         if 'python3' not in self.depends:
             # We ensure here that the recipe depends on python even it overrode
             # `depends`. We only do this if it doesn't already depend on any
@@ -893,12 +892,12 @@ def folder_name(self):
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):
         env = super().get_recipe_env(arch, with_flags_in_cc)
-
         env['PYTHONNOUSERSITE'] = '1'
-
         # Set the LANG, this isn't usually important but is a better default
         # as it occasionally matters how Python e.g. reads files
         env['LANG'] = "en_GB.UTF-8"
+        # Binaries made by packages installed by pip
+        env["PATH"] = join(self.hostpython_site_dir, "bin") + ":" + env["PATH"]
 
         if not self.call_hostpython_via_targetpython:
             env['CFLAGS'] += ' -I{}'.format(
@@ -978,27 +977,35 @@ def install_hostpython_package(self, arch):
                 '--install-lib=Lib/site-packages',
                 _env=env, *self.setup_extra_args)
 
-    @property
-    def python_version(self):
-        return Recipe.get_recipe("python3", self.ctx).version
+    def get_python_formatted_version(self):
+        parsed_version = packaging.version.parse(self.ctx.python_recipe.version)
+        return f"{parsed_version.major}.{parsed_version.minor}"
+
+    def install_hostpython_prerequisites(self, packages=None, force_upgrade=True):
+        if not packages:
+            packages = self.hostpython_prerequisites
 
-    def install_hostpython_prerequisites(self, force_upgrade=True):
-        if len(self.hostpython_prerequisites) == 0:
+        if len(packages) == 0:
             return
+
         pip_options = [
             "install",
-            *self.hostpython_prerequisites,
+            *packages,
             "--target", self.hostpython_site_dir, "--python-version",
-            self.python_version,
+            self.ctx.python_recipe.version,
             # Don't use sources, instead wheels
             "--only-binary=:all:",
-            "--no-deps"
+            # "--no-deps"
         ]
         if force_upgrade:
             pip_options.append("--upgrade")
         # Use system's pip
         shprint(sh.pip, *pip_options)
 
+    def restore_hostpython_prerequisites(self, package):
+        original_version = Recipe.get_recipe(package, self.ctx).version
+        self.install_hostpython_prerequisites(packages=[package + "==" + original_version])
+
 
 class CompiledComponentsPythonRecipe(PythonRecipe):
     pre_build_ext = False
@@ -1157,7 +1164,148 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
         return env
 
 
-class RustCompiledComponentsRecipe(PythonRecipe):
+class PyProjectRecipe(PythonRecipe):
+    '''Recipe for projects which containes `pyproject.toml`'''
+
+    # Extra args to pass to `python -m build ...`
+    extra_build_args = []
+    call_hostpython_via_targetpython = False
+
+    def __init__(self, *arg, **kwargs):
+        super().__init__(*arg, **kwargs)
+
+    def get_recipe_env(self, arch, **kwargs):
+        self.ctx.python_recipe.python_exe = join(
+            self.ctx.python_recipe.get_build_dir(arch), "android-build", "python3")
+        return super().get_recipe_env(arch, **kwargs)
+
+    def build_arch(self, arch):
+        self.install_hostpython_prerequisites(
+            packages=["build[virtualenv]", "pip"] + self.hostpython_prerequisites
+        )
+        build_dir = self.get_build_dir(arch.arch)
+        env = self.get_recipe_env(arch, with_flags_in_cc=True)
+        built_wheel = None
+        # make build dir separatly
+        sub_build_dir = join(build_dir, "p4a_android_build")
+        ensure_dir(sub_build_dir)
+        # copy hostpython to built python to ensure correct libs and includes
+        shprint(sh.cp, self.real_hostpython_location, self.ctx.python_recipe.python_exe)
+
+        build_args = [
+            "-m",
+            "build",
+            # "--no-isolation",
+            # "--skip-dependency-check",
+            "--wheel",
+            "--config-setting",
+            "builddir={}".format(sub_build_dir),
+        ] + self.extra_build_args
+
+        with current_directory(build_dir):
+            shprint(
+                sh.Command(self.ctx.python_recipe.python_exe), *build_args, _env=env
+            )
+            built_wheel = realpath(glob.glob("dist/*.whl")[0])
+
+        info("Unzipping built wheel '{}'".format(basename(built_wheel)))
+
+        with zipfile.ZipFile(built_wheel, "r") as zip_ref:
+            zip_ref.extractall(self.ctx.get_python_install_dir(arch.arch))
+        info("Successfully installed  '{}'".format(basename(built_wheel)))
+
+
+class MesonRecipe(PyProjectRecipe):
+    '''Recipe for projects which uses meson as build system'''
+
+    meson_version = "1.4.0"
+    ninja_version = "1.11.1.1"
+
+    def sanitize_flags(self, *flag_strings):
+        return " ".join(flag_strings).strip().split(" ")
+
+    def get_recipe_meson_options(self, arch):
+        """Writes python dict to meson config file"""
+        env = self.get_recipe_env(arch, with_flags_in_cc=True)
+        return {
+            "binaries": {
+                "c": arch.get_clang_exe(with_target=True),
+                "cpp": arch.get_clang_exe(with_target=True, plus_plus=True),
+                "ar": self.ctx.ndk.llvm_ar,
+                "strip": self.ctx.ndk.llvm_strip,
+            },
+            "built-in options": {
+                "c_args": self.sanitize_flags(env["CFLAGS"], env["CPPFLAGS"]),
+                "cpp_args": self.sanitize_flags(env["CXXFLAGS"], env["CPPFLAGS"]),
+                "c_link_args": self.sanitize_flags(env["LDFLAGS"]),
+                "cpp_link_args": self.sanitize_flags(env["LDFLAGS"]),
+            },
+            "properties": {
+                "needs_exe_wrapper": True,
+                "sys_root": self.ctx.ndk.sysroot
+            },
+            "host_machine": {
+                "cpu_family": {
+                    "arm64-v8a": "aarch64",
+                    "armeabi-v7a": "arm",
+                    "x86_64": "x86_64",
+                    "x86": "x86"
+                }[arch.arch],
+                "cpu": {
+                    "arm64-v8a": "aarch64",
+                    "armeabi-v7a": "armv7",
+                    "x86_64": "x86_64",
+                    "x86": "i686"
+                }[arch.arch],
+                "endian": "little",
+                "system": "android",
+            }
+        }
+
+    def write_build_options(self, arch):
+        option_data = ""
+        build_options = self.get_recipe_meson_options(arch)
+        for key in build_options.keys():
+            data_chunk = "[{}]".format(key)
+            for subkey in build_options[key].keys():
+                value = build_options[key][subkey]
+                if isinstance(value, int):
+                    value = str(value)
+                elif isinstance(value, str):
+                    value = "'{}'".format(value)
+                elif isinstance(value, bool):
+                    value = "true" if value else "false"
+                elif isinstance(value, list):
+                    value = "['" + "', '".join(value) + "']"
+                data_chunk += "\n" + subkey + " = " + value
+            option_data += data_chunk + "\n\n"
+        return option_data
+
+    def ensure_args(self, *args):
+        for arg in args:
+            if arg not in self.extra_build_args:
+                self.extra_build_args.append(arg)
+
+    def build_arch(self, arch):
+        cross_file = join(self.get_build_dir(arch), "android.meson.cross")
+        info("Writing cross file at: {}".format(cross_file))
+        # write cross config file
+        with open(cross_file, "w") as file:
+            file.write(self.write_build_options(arch))
+            file.close()
+        # set cross file
+        self.ensure_args('-Csetup-args=--cross-file', '-Csetup-args={}'.format(cross_file))
+        # ensure ninja and meson
+        for dep in [
+            "ninja=={}".format(self.ninja_version),
+            "meson=={}".format(self.meson_version),
+        ]:
+            if dep not in self.hostpython_prerequisites:
+                self.hostpython_prerequisites.append(dep)
+        super().build_arch(arch)
+
+
+class RustCompiledComponentsRecipe(PyProjectRecipe):
     # Rust toolchain codes
     # https://doc.rust-lang.org/nightly/rustc/platform-support.html
     RUST_ARCH_CODES = {
@@ -1167,41 +1315,10 @@ class RustCompiledComponentsRecipe(PythonRecipe):
         "x86": "i686-linux-android",
     }
 
-    # Build python wheel using `maturin` instead
-    # of default `python -m build [...]`
-    use_maturin = False
-
-    # Directory where to find built wheel
-    # For normal build: "dist/*.whl"
-    # For maturin: "target/wheels/*-linux_*.whl"
-    built_wheel_pattern = None
-
     call_hostpython_via_targetpython = False
 
-    def __init__(self, *arg, **kwargs):
-        super().__init__(*arg, **kwargs)
-        self.append_deps_if_absent(["python3"])
-        self.set_default_hostpython_deps()
-        if not self.built_wheel_pattern:
-            self.built_wheel_pattern = (
-                "target/wheels/*-linux_*.whl"
-                if self.use_maturin
-                else "dist/*.whl"
-            )
-
-    def set_default_hostpython_deps(self):
-        if not self.use_maturin:
-            self.hostpython_prerequisites += ["build", "setuptools_rust", "wheel", "pyproject_hooks"]
-        else:
-            self.hostpython_prerequisites += ["maturin"]
-
-    def append_deps_if_absent(self, deps):
-        for dep in deps:
-            if dep not in self.depends:
-                self.depends.append(dep)
-
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
 
         # Set rust build target
         build_target = self.RUST_ARCH_CODES[arch.arch]
@@ -1220,7 +1337,7 @@ def get_recipe_env(self, arch):
                 self.ctx.ndk_api,
             ),
         )
-        realpython_dir = Recipe.get_recipe("python3", self.ctx).get_build_dir(arch.arch)
+        realpython_dir = self.ctx.python_recipe.get_build_dir(arch.arch)
 
         env["RUSTFLAGS"] = "-Clink-args=-L{} -L{}".format(
             self.ctx.get_libs_dir(arch.arch), join(realpython_dir, "android-build")
@@ -1243,10 +1360,6 @@ def get_recipe_env(self, arch):
         )
         return env
 
-    def get_python_formatted_version(self):
-        parsed_version = packaging.version.parse(self.python_version)
-        return f"{parsed_version.major}.{parsed_version.minor}"
-
     def check_host_deps(self):
         if not hasattr(sh, "rustup"):
             error(
@@ -1258,41 +1371,7 @@ def check_host_deps(self):
 
     def build_arch(self, arch):
         self.check_host_deps()
-        self.install_hostpython_prerequisites()
-        build_dir = self.get_build_dir(arch.arch)
-        env = self.get_recipe_env(arch)
-        built_wheel = None
-
-        # Copy the exec with version info
-        hostpython_exec = join(
-            sep,
-            *self.hostpython_location.split(sep)[:-1],
-            "python{}".format(self.get_python_formatted_version()),
-        )
-        shprint(sh.cp, self.hostpython_location, hostpython_exec)
-
-        with current_directory(build_dir):
-            if self.use_maturin:
-                shprint(
-                    sh.Command(join(self.hostpython_site_dir, "bin", "maturin")),
-                    "build", "--interpreter", hostpython_exec, "--skip-auditwheel",
-                    _env=env,
-                )
-            else:
-                shprint(
-                    sh.Command(hostpython_exec),
-                    "-m", "build", "--no-isolation", "--skip-dependency-check", "--wheel",
-                    _env=env,
-                )
-            # Find the built wheel
-            built_wheel = realpath(glob.glob(self.built_wheel_pattern)[0])
-
-        info("Unzipping built wheel '{}'".format(basename(built_wheel)))
-
-        # Unzip .whl file into site-packages
-        with zipfile.ZipFile(built_wheel, "r") as zip_ref:
-            zip_ref.extractall(self.ctx.get_python_install_dir(arch.arch))
-        info("Successfully installed  '{}'".format(basename(built_wheel)))
+        super().build_arch(arch)
 
 
 class TargetPythonRecipe(Recipe):

pythonforandroid/recipes/cryptography/__init__.py

@@ -7,12 +7,10 @@ class CryptographyRecipe(RustCompiledComponentsRecipe):
     name = 'cryptography'
     version = '42.0.1'
     url = 'https://github.com/pyca/cryptography/archive/refs/tags/{version}.tar.gz'
-    depends = ['openssl', 'six', 'setuptools', 'cffi']
-    # recipe built cffi does not work on apple M1
-    hostpython_prerequisites = ["semantic_version", "cffi"]
+    depends = ['openssl']
 
-    def get_recipe_env(self, arch):
-        env = super().get_recipe_env(arch)
+    def get_recipe_env(self, arch, **kwargs):
+        env = super().get_recipe_env(arch, **kwargs)
         openssl_build_dir = self.get_recipe('openssl', self.ctx).get_build_dir(arch.arch)
         build_target = self.RUST_ARCH_CODES[arch.arch].upper().replace("-", "_")
         openssl_include = "{}_OPENSSL_INCLUDE_DIR".format(build_target)

pythonforandroid/recipes/matplotlib/__init__.py

@@ -7,7 +7,7 @@
 
 class MatplotlibRecipe(CppCompiledComponentsPythonRecipe):
 
-    version = '3.5.2'
+    version = '3.8.4'
     url = 'https://github.com/matplotlib/matplotlib/archive/v{version}.zip'
 
     depends = ['kiwisolver', 'numpy', 'pillow', 'setuptools', 'freetype']