Made pyjnius recipe work

Author: inclement

recipes/pyjnius/__init__.py

@@ -1,5 +1,8 @@
 
-from toolchain import CythonRecipe, shprint
+from toolchain import CythonRecipe, shprint, ArchAndroid, current_directory
+import sh
+import glob
+from os.path import join
 
 
 class PyjniusRecipe(CythonRecipe):
@@ -8,5 +11,45 @@ class PyjniusRecipe(CythonRecipe):
     name = 'pyjnius'
     depends = ['python2', 'sdl']
 
+    def build_armeabi(self):
+        env = ArchAndroid(self.ctx).get_env()
+
+        env['LDFLAGS'] = env['LDFLAGS'] + ' -L{}'.format(self.ctx.libs_dir)
+        env['LDSHARED'] = env['LIBLINK']
+
+        # AND: Hack to make pyjnius setup.py detect android build
+        env['NDKPLATFORM'] = 'NOTNONE'
+
+        with current_directory(self.get_actual_build_dir('armeabi')):
+            hostpython = sh.Command(self.ctx.hostpython)
+
+            # First build is fake in order to generate files that will be cythonized
+            print('First build attempt will fail as hostpython doesn\'t have cython available:')
+            try:
+                shprint(hostpython, 'setup.py', 'build_ext', _env=env)
+            except sh.ErrorReturnCode_1:
+                print('failed (as expected)')
+
+
+            print('Running cython where appropriate')
+            shprint(sh.find, self.get_actual_build_dir('armeabi'), '-iname', '*.pyx', '-exec',
+                    self.ctx.cython, '{}', ';', _env=env)
+            print('ran cython')
+
+            print('testing')
+            shprint(sh.echo, 'test', '')
+
+            shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env)
+
+            build_lib = glob.glob('./build/lib*')
+            shprint(sh.find, build_lib[0], '-name', '"*.o"', '-exec',
+                    env['STRIP'], '{}', ';', _env=env)
+
+            shprint(hostpython, 'setup.py', 'install', '-O2', _env=env)
+
+            shprint(sh.cp, '-a', join('jnius', 'src', 'org'), self.ctx.javaclass_dir)
+
+            
+
 
 recipe = PyjniusRecipe()

recipes/python2/__init__.py

@@ -40,11 +40,11 @@ def build_armeabi(self):
             print('sqlite or openssl support not yet enabled in python recipe')
             exit(1)
 
-        self.ctx.hostpython = join(self.ctx.build_dir, 'python-install',
-                                   'bin', 'python.host')
-
         if exists(join(self.ctx.libs_dir, 'libpython2.7.so')):
             print('libpython2.7.so already exists, skipping python build.')
+            self.ctx.hostpython = join(self.ctx.build_dir, 'python-install',
+                                       'bin', 'python.host')
+
             return
 
         with current_directory(self.get_actual_build_dir('armeabi')):

toolchain.py

@@ -42,6 +42,7 @@ def shprint(command, *args, **kwargs):
     kwargs["_iter"] = True
     kwargs["_out_bufsize"] = 1
     kwargs["_err_to_out"] = True
+    print('EXEC: ', command, *args)
     output = command(*args, **kwargs)
     for line in output:
         stdout.write(line)
@@ -261,7 +262,8 @@ def get_env(self):
 
         # AND: This stuff is set elsewhere in distribute.sh. Does that matter?
         env['ARCH'] = self.arch
-        env['LIBLINK_PATH'] = join(self.ctx.build_dir, 'other_builds')
+        env['LIBLINK_PATH'] = join(self.ctx.build_dir, 'other_builds', 'objects')
+        ensure_dir(env['LIBLINK_PATH'])  # AND: This should be elsewhere
         env['LIBLINK'] = join(self.ctx.bootstrap.build_dir, 'tools', 'liblink')
         env['BIGLINK'] = join(self.ctx.bootstrap.build_dir, 'tools', 'biglink')
 
@@ -353,6 +355,7 @@ class Context(object):
     build_dir = None  # in which bootstraps are copied for building and recipes are built
     dist_dir = None  # the Android project folder where everything ends up
     libs_dir = None
+    javaclass_dir = None
     ccache = None  # whether to use ccache
     cython = None  # the cython interpreter name
 
@@ -427,6 +430,7 @@ def __init__(self):
         # AND: Are the install_dir and include_dir the same for Android?
         self.install_dir = "{}/dist/root".format(self.root_dir)
         self.include_dir = "{}/dist/include".format(self.root_dir)
+        self.javaclass_dir = join(self.build_dir, 'java')
         self.archs = (
             ArchAndroid(self),  # AND: Just 32 bit for now?
             )
@@ -468,6 +472,7 @@ def __init__(self):
         ensure_dir(self.dist_dir)
         ensure_dir(self.install_dir)
         ensure_dir(self.libs_dir)
+        ensure_dir(self.javaclass_dir)
 
         ensure_dir(join(self.build_dir, 'bootstrap_builds'))
         ensure_dir(join(self.build_dir, 'other_builds'))  # where everything else is built