Removed references to ctx.ndk_is_crystax

inclement · inclement · commit 990097d03efd · 2016-01-10T21:23:13.000Z
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -235,8 +235,8 @@ def _unpack_aar(self, aar, arch):
 
     def strip_libraries(self, arch):
         info('Stripping libraries')
-        if self.ctx.ndk_is_crystax:
-            info('NDK is CrystaX, skipping')
+        if self.ctx.python_recipe.from_crystax:
+            info('Python was loaded from CrystaX, skipping strip')
             return
         env = arch.get_env()
         strip = which('arm-linux-androideabi-strip', env['PATH'])
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -28,16 +28,16 @@ def run_distribute(self):
         with current_directory(self.dist_dir):
             info('Copying python distribution')
 
-            if not exists('private') and not self.ctx.ndk_is_crystax:
+            if not exists('private') and not self.ctx.python_recipe.from_crystax:
                 shprint(sh.mkdir, 'private')
-            if not exists('crystax_python') and self.ctx.ndk_is_crystax:
+            if not exists('crystax_python') and self.ctx.python_recipe.from_crystax:
                 shprint(sh.mkdir, 'crystax_python')
                 shprint(sh.mkdir, 'crystax_python/crystax_python')
             if not exists('assets'):
                 shprint(sh.mkdir, 'assets')
             
             hostpython = sh.Command(self.ctx.hostpython)
-            if not self.ctx.ndk_is_crystax:
+            if not self.ctx.python_recipe.from_crystax:
                 shprint(hostpython, '-OO', '-m', 'compileall',
                         self.ctx.get_python_install_dir(),
                         _tail=10, _filterout="^Listing", _critical=True)
@@ -48,7 +48,7 @@ def run_distribute(self):
             self.distribute_aars(arch)
             self.distribute_javaclasses(self.ctx.javaclass_dir)
 
-            if not self.ctx.ndk_is_crystax:
+            if not self.ctx.python_recipe.from_crystax:
                 info('Filling private directory')
                 if not exists(join('private', 'lib')):
                     info('private/lib does not exist, making')
@@ -85,9 +85,10 @@ def run_distribute(self):
                     # shprint(sh.rm, '-rf', 'lib-dynload/_ctypes_test.so')
                     # shprint(sh.rm, '-rf', 'lib-dynload/_testcapi.so')
 
-            else:  # NDK *is* crystax
+            else:  # Python *is* loaded from crystax
                 ndk_dir = self.ctx.ndk_dir
-                python_dir = join(ndk_dir, 'sources', 'python', '3.5',
+                py_recipe = self.ctx.python_recipe
+                python_dir = join(ndk_dir, 'sources', 'python', py_recipe.version,
                                   'libs', arch.arch)
                 
                 shprint(sh.cp, '-r', join(python_dir, 'stdlib.zip'), 'crystax_python/crystax_python')
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -554,7 +554,7 @@ def build_recipes(build_order, python_modules, ctx):
         # 4) biglink everything
         # AND: Should make this optional
         info_main('# Biglinking object files')
-        if not ctx.ndk_is_crystax:
+        if not ctx.python_recipe.from_crystax:
             biglink(ctx, arch)
         else:
             info('NDK is crystax, skipping biglink (will this work?)')
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -722,7 +722,7 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
             # hostpython = sh.Command('python3.5')
 
 
-            if self.ctx.ndk_is_crystax:
+            if self.ctx.python_recipe.from_crystax:
                 # hppath = join(dirname(self.hostpython_location), 'Lib',
                 #               'site-packages')
                 hpenv = env.copy()
@@ -856,7 +856,7 @@ def build_cython_components(self, arch):
 
             if manually_cythonise:
                 info('Running cython where appropriate')
-                if self.ctx.ndk_is_crystax:
+                if self.ctx.python_recipe.from_crystax:
                     shprint(sh.find, self.get_build_dir(arch.arch), '-iname', '*.pyx',
                             '-exec', 'cython', '{}', ';')
                     # AND: Need to choose cython version more carefully
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -15,7 +15,6 @@ class Python3Recipe(Recipe):
 
     def __init__(self, **kwargs):
         super(Python3Recipe, self).__init__(**kwargs)
-        self.crystax = lambda *args: True if self.ctx.ndk_is_crystax else False
 
     def prebuild_arch(self, arch):
         build_dir = self.get_build_container_dir(arch.arch)
