Added hostpython3 recipe

inclement · inclement · commit 008b41d3e266 · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -13,7 +13,7 @@
 class SDL2GradleBootstrap(Bootstrap):
     name = 'sdl2_gradle'
 
-    recipe_depends = ['sdl2', ('python2', 'python3crystax')]
+    recipe_depends = ['sdl2', ('python2', 'python3', 'python3crystax')]
 
     def run_distribute(self):
         info_main("# Creating Android project ({})".format(self.name))
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -952,7 +952,7 @@ class CythonRecipe(PythonRecipe):
     def __init__(self, *args, **kwargs):
         super(CythonRecipe, self).__init__(*args, **kwargs)
         depends = self.depends
-        depends.append(('python2', 'python3crystax'))
+        depends.append(('python2', 'python3', 'python3crystax'))
         depends = list(set(depends))
         self.depends = depends
 
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -0,0 +1,53 @@
+from pythonforandroid.toolchain import Recipe, shprint, info, warning
+from pythonforandroid.util import ensure_dir, current_directory
+from os.path import join, exists
+import os
+import sh
+
+
+class Hostpython3Recipe(Recipe):
+    version = 'bpo-30386'
+    url = 'https://github.com/inclement/cpython/archive/{version}.zip'
+    name = 'hostpython3'
+
+    conflicts = ['hostpython2']
+
+    def get_build_container_dir(self, arch=None):
+        choices = self.check_recipe_choices()
+        dir_name = '-'.join([self.name] + choices)
+        return join(self.ctx.build_dir, 'other_builds', dir_name, 'desktop')
+
+    def get_build_dir(self, arch=None):
+        # Unlike other recipes, the hostpython build dir doesn't depend on the target arch
+        return join(self.get_build_container_dir(), self.name)
+
+    def build_arch(self, arch):
+        recipe_build_dir = self.get_build_dir(arch.arch)
+        with current_directory(recipe_build_dir):
+            # Create a subdirectory to actually perform the build
+            build_dir = join(recipe_build_dir, 'native-build')
+            ensure_dir(build_dir)
+
+            env = {}  # The command line environment we will use
+
+
+            # Configure the build
+            with current_directory(build_dir):
+                if not exists('config.status'):
+                    shprint(sh.Command(join(recipe_build_dir, 'configure')))
+
+            # Create the Setup file. This copying from Setup.dist
+            # seems to be the normal and expected procedure.
+            assert exists(join(build_dir, 'Modules')), (
+                'Expected dir {} does not exist'.format(join(build_dir, 'Modules')))
+            shprint(sh.cp, join('Modules', 'Setup.dist'), join(build_dir, 'Modules', 'Setup'))
+
+            result = shprint(sh.make, '-C', build_dir)
+
+        self.ctx.hostpython = join(build_dir, 'python')
+        self.ctx.hostpgen = '/usr/bin/false'  # is this actually used for anything?
+
+        print('result is', result)
+        exit(1)
+
+recipe = Hostpython3Recipe()
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -9,7 +9,7 @@ class PyjniusRecipe(CythonRecipe):
     version = '1.1.3'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('python2', 'python3crystax'), ('genericndkbuild', 'sdl2', 'sdl'), 'six']
+    depends = [('python2', 'python3', 'python3crystax'), ('genericndkbuild', 'sdl2', 'sdl'), 'six']
     site_packages_name = 'jnius'
 
     patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -0,0 +1,18 @@
+from pythonforandroid.recipe import TargetPythonRecipe, Recipe
+from pythonforandroid.toolchain import shprint, current_directory, info
+from pythonforandroid.patching import (is_darwin, is_api_gt,
+                                       check_all, is_api_lt, is_ndk)
+from os.path import exists, join, realpath
+import sh
+
+
+class Python3Recipe(TargetPythonRecipe):
+    version = 'bpo-30386'
+    url = 'https://github.com/inclement/cpython/archive/{version}.zip'
+    name = 'python3'
+
+    depends = ['hostpython3']
+    conflicts = ['python3crystax', 'python2']
+    opt_depends = ['openssl', 'sqlite3']
+
+recipe = Python3Recipe()
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -10,7 +10,7 @@ class LibSDL2Recipe(BootstrapNDKRecipe):
 
     dir_name = 'SDL'
 
-    depends = [('python2', 'python3crystax'), 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
+    depends = [('python2', 'python3', 'python3crystax'), 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
     conflicts = ['sdl', 'pygame', 'pygame_bootstrap_components']
 
     patches = ['add_nativeSetEnv.patch']
diff --git a/pythonforandroid/recipes/six/__init__.py b/pythonforandroid/recipes/six/__init__.py
@@ -5,7 +5,6 @@
 class SixRecipe(PythonRecipe):
     version = '1.9.0'
     url = 'https://pypi.python.org/packages/source/s/six/six-{version}.tar.gz'
-    depends = [('python2', 'python3crystax')]
 
 
 recipe = SixRecipe()
diff --git a/testapps/setup_testapp_python3.py b/testapps/setup_testapp_python3.py
@@ -2,8 +2,8 @@
 from distutils.core import setup
 from setuptools import find_packages
 
-options = {'apk': {
-                   'requirements': 'sdl2,pyjnius,kivy,python3crystax',
+options = {'apk': {'debug': None,
+                   'requirements': 'sdl2,pyjnius,kivy,python3',
                    'android-api': 19,
                    'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
                    'dist-name': 'bdisttest_python3',
diff --git a/testapps/setup_testapp_python3crystax.py b/testapps/setup_testapp_python3crystax.py
@@ -0,0 +1,31 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'debug': None,
+                   'requirements': 'sdl2,pyjnius,kivy,python3crystax',
+                   'android-api': 19,
+                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'dist-name': 'bdisttest_python3',
+                   'ndk-version': '10.3.2',
+                   'arch': 'armeabi-v7a',
+                   'permission': 'VIBRATE',
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+packages = find_packages()
+print('packages are', packages)
+
+setup(
+    name='testapp_python3',
+    version='1.1',
+    description='p4a setup.py test',
+    author='Alexander Taylor',
+    author_email='alexanderjohntaylor@gmail.com',
+    packages=find_packages(),
+    options=options,
+    package_data={'testapp': ['*.py', '*.png']}
+)
