Changed python3crystax install process

inclement · inclement · commit 6649020e6382 · 2016-01-10T21:18:17.000Z
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -130,13 +130,6 @@ def ndk_ver(self, value):
     def ndk_is_crystax(self):
         return True if self.ndk_ver[:7] == 'crystax' else False
 
-    def ensure_crystax_python_install_dir(self):
-        dirn = self.get_python_install_dir()
-        ensure_dir(dirn)
-        ensure_dir(join(dirn, 'lib'))
-        sh.cp('-r', '/home/asandy/kivytest/crystax_stdlib', join(dirn, 'lib', 'python3.5'))
-        sh.cp('-r', '/home/asandy/android/crystax-ndk-10.3.0/sources/python/3.5/libs/armeabi/modules', join(dirn, 'lib', 'python3.5', 'lib-dynload'))
-        ensure_dir(join(dirn, 'lib', 'site-packages'))
 
     @property
     def sdk_dir(self):
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -719,25 +719,26 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
 
 
             if self.ctx.ndk_is_crystax:
-                hppath = join(dirname(self.hostpython_location), 'Lib',
-                              'site-packages')
+                # hppath = join(dirname(self.hostpython_location), 'Lib',
+                #               'site-packages')
                 hpenv = env.copy()
-                if 'PYTHONPATH' in hpenv:
-                    hpenv['PYTHONPATH'] = ':'.join([hppath] +
-                                                   hpenv['PYTHONPATH'].split(':'))
-                else:
-                    hpenv['PYTHONPATH'] = hppath
+                # if 'PYTHONPATH' in hpenv:
+                #     hpenv['PYTHONPATH'] = ':'.join([hppath] +
+                #                                    hpenv['PYTHONPATH'].split(':'))
+                # else:
+                #     hpenv['PYTHONPATH'] = hppath
                 # hpenv['PYTHONHOME'] = self.ctx.get_python_install_dir()
                 # shprint(hostpython, 'setup.py', 'build',
                 #         _env=hpenv, *self.setup_extra_args)
                 shprint(hostpython, 'setup.py', 'install', '-O2',
                         '--root={}'.format(self.ctx.get_python_install_dir()),
-                        '--install-lib=lib/python3.5/site-packages',
+                        '--install-lib=.',
+                        # AND: will need to unhardcode the 3.5 when adding 2.7 (and other crystax supported versions)
                         _env=hpenv, *self.setup_extra_args)
-                site_packages_dir = self.ctx.get_site_packages_dir()
-                built_files = glob.glob(join('build', 'lib*', '*'))
-                for filen in built_files:
-                    shprint(sh.cp, '-r', filen, join(site_packages_dir, split(filen)[-1]))
+                # site_packages_dir = self.ctx.get_site_packages_dir()
+                # built_files = glob.glob(join('build', 'lib*', '*'))
+                # for filen in built_files:
+                #     shprint(sh.cp, '-r', filen, join(site_packages_dir, split(filen)[-1]))
             elif self.call_hostpython_via_targetpython:
                 shprint(hostpython, 'setup.py', 'install', '-O2', _env=env,
                         *self.setup_extra_args)
diff --git a/pythonforandroid/recipes/python3crystax/__init__.py b/pythonforandroid/recipes/python3crystax/__init__.py
@@ -1,28 +1,45 @@
 
 from pythonforandroid.toolchain import Recipe, shprint, current_directory, ArchARM
 from pythonforandroid.logger import info
+from pythonforandroid.util import ensure_dir
 from os.path import exists, join
 from os import uname
 import glob
 import sh
 
 class Python3Recipe(Recipe):
-    version = ''
+    version = '3.5'
     url = ''
     name = 'python3crystax'
 
-    depends = ['hostpython3']  
+    depends = ['hostpython3crystax']  
     conflicts = ['python2', 'python3']
 
-    def __init__(self, **kwargs):
-        super(Python3Recipe, self).__init__(**kwargs)
-        self.crystax = lambda *args: True if self.ctx.ndk_is_crystax else False
+    def get_dir_name(self):
+        name = super(Python3Recipe, self).get_dir_name()
+        name += '-version{}'.format(self.version)
+        return name
 
     def prebuild_arch(self, arch):
-        self.ctx.ensure_crystax_python_install_dir()
+        if not self.ctx.ndk_is_crystax:
+            error('The python3crystax recipe can only be built when '
+                  'using the CrystaX NDK. Exiting.')
+            exit(1)
 
     def build_arch(self, arch):
-        info('doing nothing, the crystax python3 is included in the ndk!')
-
+        info('Extracting CrystaX python3 from NDK package')
+        # This is necessary (I think?) in order for the
+        # cross-compilation to work
+
+        dirn = self.ctx.get_python_install_dir()
+        ensure_dir(dirn)
+        # ensure_dir(join(dirn, 'lib'))
+        # ensure_dir(join(dirn, 'lib', 'python{}'.format(self.version),
+        #                 'site-packages'))
+
+        # ndk_dir = self.ctx.ndk_dir
+        # sh.cp('-r', '/home/asandy/kivytest/crystax_stdlib', join(dirn, 'lib', 'python3.5'))
+        # sh.cp('-r', '/home/asandy/android/crystax-ndk-10.3.0/sources/python/3.5/libs/armeabi/modules', join(dirn, 'lib', 'python3.5', 'lib-dynload'))
+        # ensure_dir(join(dirn, 'lib', 'site-packages'))
 
 recipe = Python3Recipe()
