Modified CythonRecipe to work with crystax build

inclement · inclement · commit 6534656380ec · 2016-01-10T21:18:17.000Z
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -815,37 +815,54 @@ def build_arch(self, arch):
 
     def build_cython_components(self, arch):
         info('Cythonizing anything necessary in {}'.format(self.name))
+
         env = self.get_recipe_env(arch)
-        # env['PYTHONHOME'] = self.ctx.get_python_install_dir()
-        env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
+
+        if self.ctx.ndk_is_crystax:
+            site_packages_dirs = sh.Command('python3.5')('-c', 'import site; print("\\n".join(site.getsitepackages()))').stdout.split('\n')
+            # env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
+            if 'PYTHONPATH' in env:
+                env['PYTHONPATH'] = env + ':{}'.format(':'.join(site_packages_dirs))
+            else:
+                env['PYTHONPATH'] = ':'.join(site_packages_dirs)
+
         with current_directory(self.get_build_dir(arch.arch)):
             # hostpython = sh.Command(self.ctx.hostpython)
             hostpython = sh.Command('python3.5')
             shprint(hostpython, '-c', 'import sys; print(sys.path)', _env=env)
             print('cwd is', realpath(curdir))
             info('Trying first build of {} to get cython files: this is '
                  'expected to fail'.format(self.name))
+
+            manually_cythonise = False
             try:
-                shprint(hostpython, 'setup.py', 'build_ext', _env=env,
+                shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env,
                         *self.setup_extra_args)
             except sh.ErrorReturnCode_1:
                 print()
                 info('{} first build failed (as expected)'.format(self.name))
+                manually_cythonise = True
 
-            info('Running cython where appropriate')
-            # shprint(sh.find, self.get_build_dir(arch.arch), '-iname', '*.pyx',
-            #         '-exec', self.ctx.cython, '{}', ';', _env=env)
-            shprint(sh.find, self.get_build_dir(arch.arch), '-iname', '*.pyx',
-                    '-exec', self.ctx.cython, '{}', ';')
-            info('ran cython')
+            if manually_cythonise:
+                info('Running cython where appropriate')
+                if self.ctx.ndk_is_crystax:
+                    shprint(sh.find, self.get_build_dir(arch.arch), '-iname', '*.pyx',
+                            '-exec', self.ctx.cython, '{}', ';')
+                else:
+                    shprint(sh.find, self.get_build_dir(arch.arch), '-iname', '*.pyx',
+                            '-exec', self.ctx.cython, '{}', ';', _env=env)
+                info('ran cython')
 
-            shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env,
-                    _tail=20, _critical=True, *self.setup_extra_args)
+                shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env,
+                        _tail=20, _critical=True, *self.setup_extra_args)
+            else:
+                info('First build appeared to complete correctly, skipping manual'
+                     'cythonising.')
 
-            # print('stripping')
-            # build_lib = glob.glob('./build/lib*')
-            # shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
-            #         env['STRIP'], '{}', ';', _env=env)
+            print('stripping')
+            build_lib = glob.glob('./build/lib*')
+            shprint(sh.find, build_lib[0], '-name', '*.o', '-exec',
+                    env['STRIP'], '{}', ';', _env=env)
             print('stripped!?')
             # exit(1)
 
diff --git a/pythonforandroid/recipes/python3crystax/__init__.py b/pythonforandroid/recipes/python3crystax/__init__.py
@@ -28,8 +28,6 @@ def prebuild_arch(self, arch):
 
     def build_arch(self, arch):
         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)
