Made kivy recipe work

Author: inclement

recipes/kivy/__init__.py

@@ -1,5 +1,8 @@
 
-from toolchain import CythonRecipe, shprint
+from toolchain import CythonRecipe, shprint, current_directory, ArchAndroid
+from os.path import exists, join
+import sh
+import glob
 
 
 class KivyRecipe(CythonRecipe):
@@ -9,5 +12,41 @@ class KivyRecipe(CythonRecipe):
 
     depends = ['pygame', 'pyjnius', 'android']
 
+    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')):
+            if exists('.done'):
+                print('android module already compiled, exiting')
+                return
+
+            hostpython = sh.Command(self.ctx.hostpython)
+            
+            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')
+
+            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)
+
+            # AND: Should check in site-packages instead!
+            sh.touch('.done')
 
 recipe = KivyRecipe()

recipes/pyjnius/__init__.py

@@ -23,6 +23,7 @@ def build_armeabi(self):
 
         # AND: Don't forget to add a check whether pyjnius has already
         # been compiled. Currently it redoes it every time.
+        # AND: This check can be for jnius in site packages
 
         with current_directory(self.get_actual_build_dir('armeabi')):
             if exists('.done'):
@@ -44,9 +45,6 @@ def build_armeabi(self):
                     self.ctx.cython, '{}', ';', _env=env)
             print('ran cython')
 
-            print('testing')
-            shprint(sh.echo, 'test', '')
-
             shprint(hostpython, 'setup.py', 'build_ext', '-v', _env=env)
 
 
@@ -58,7 +56,7 @@ def build_armeabi(self):
 
             shprint(sh.cp, '-a', join('jnius', 'src', 'org'), self.ctx.javaclass_dir)
 
-            shprint(sh.touch, '.done')
+            sh.touch('.done')
 
 
 

toolchain.py

@@ -759,7 +759,8 @@ def prepare_build_dir(self, ctx):
             shprint(sh.rm, '-rf', build_dir)
             shprint(sh.mkdir, '-p', build_dir)
             shprint(sh.rmdir, build_dir)
-            shprint(sh.ln, '-s', user_dir, build_dir)
+            ensure_dir(build_dir)
+            shprint(sh.ln, '-s', user_dir, join(build_dir, get_directory(self.versioned_url)))
             return
 
         ensure_dir(build_dir)
@@ -805,6 +806,7 @@ def prepare_build_dir(self, ctx):
             # AND: Should use requests or something for this?
             shprint(sh.rm, '-f', marker_filename)
             #shprint(sh.wget, filename, url)
+            print('wgetting')  # AND: Use tito's nice function for this
             r = requests.get(url)
             with open(filename, 'wb') as fileh:
                 for chunk in r.iter_content():