Merge pull request #919 from inclement/testapp_improvements

Testapp improvements

Author: inclement

pythonforandroid/toolchain.py

@@ -560,11 +560,13 @@ def clean_dists(self, args):
 
     def clean_bootstrap_builds(self, args):
         '''Delete all the bootstrap builds.'''
-        for bs in Bootstrap.list_bootstraps():
-            bs = Bootstrap.get_bootstrap(bs, self.ctx)
-            if bs.build_dir and exists(bs.build_dir):
-                info('Cleaning build for {} bootstrap.'.format(bs.name))
-                shutil.rmtree(bs.build_dir)
+        if exists(join(self.ctx.build_dir, 'bootstrap_builds')):
+            shutil.rmtree(join(self.ctx.build_dir, 'bootstrap_builds'))
+        # for bs in Bootstrap.list_bootstraps():
+        #     bs = Bootstrap.get_bootstrap(bs, self.ctx)
+        #     if bs.build_dir and exists(bs.build_dir):
+        #         info('Cleaning build for {} bootstrap.'.format(bs.name))
+        #         shutil.rmtree(bs.build_dir)
 
     def clean_builds(self, args):
         '''Delete all build caches for each recipe, python-install, java code
@@ -610,7 +612,7 @@ def clean_download_cache(self, args):
         This does *not* delete the build caches or final distributions.
         '''
         ctx = self.ctx
-        if args.recipes:
+        if hasattr(args, 'recipes') and args.recipes:
             for package in args.recipes:
                 remove_path = join(ctx.packages_path, package)
                 if exists(remove_path):

testapps/setup_keyboard.py

@@ -0,0 +1,30 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'debug': None,
+                   'requirements': 'sdl2,pyjnius,kivy,python2',
+                   'android-api': 19,
+                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'dist-name': 'bdisttest',
+                   'ndk-version': '10.3.2',
+                   'permission': 'VIBRATE',
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+packages = find_packages()
+print('packages are', packages)
+
+setup(
+    name='testapp_keyboard',
+    version='1.1',
+    description='p4a setup.py test',
+    author='Alexander Taylor',
+    author_email='[email protected]',
+    packages=find_packages(),
+    options=options,
+    package_data={'setup_keyboard': ['*.py', '*.png']}
+)

testapps/setup_pygame.py

@@ -0,0 +1,31 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'debug': None,
+                   'requirements': 'pygame,pyjnius,kivy,python2',
+                   'android-api': 19,
+                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'dist-name': 'bdisttest_pygame',
+                   'orientation': 'portrait',
+                   'ndk-version': '10.3.2',
+                   'permission': 'VIBRATE',
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+packages = find_packages()
+print('packages are', packages)
+
+setup(
+    name='testapp_setup_pygame',
+    version='1.1',
+    description='p4a setup.py test with pygame',
+    author='Alexander Taylor',
+    author_email='[email protected]',
+    packages=find_packages(),
+    options=options,
+    package_data={'testapp_pygame': ['*.py', '*.png']}
+)

testapps/testapp_setup/setup.py renamed to testapps/setup_testapp_python2.py

@@ -19,7 +19,7 @@
 print('packages are', packages)
 
 setup(
-    name='testapp_setup',
+    name='testapp_python2',
     version='1.1',
     description='p4a setup.py test',
     author='Alexander Taylor',

testapps/setup_testapp_python3.py

@@ -0,0 +1,30 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'debug': None,
+                   'requirements': 'sdl2,pyjnius,kivy,python3crystax',
+                   'android-api': 19,
+                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'dist-name': 'bdisttest',
+                   'ndk-version': '10.3.2',
+                   'permission': 'VIBRATE',
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+packages = find_packages()
+print('packages are', packages)
+
+setup(
+    name='testapp_python3',
+    version='1.1',
+    description='p4a setup.py test',
+    author='Alexander Taylor',
+    author_email='[email protected]',
+    packages=find_packages(),
+    options=options,
+    package_data={'testapp': ['*.py', '*.png']}
+)

testapps/setup_vispy.py

@@ -0,0 +1,30 @@
+
+from distutils.core import setup
+from setuptools import find_packages
+
+options = {'apk': {'debug': None,
+                   'requirements': 'vispy',
+                   'android-api': 19,
+                   'ndk-dir': '/home/asandy/android/crystax-ndk-10.3.2',
+                   'dist-name': 'bdisttest',
+                   'ndk-version': '10.3.2',
+                   'permission': 'VIBRATE',
+                   }}
+
+package_data = {'': ['*.py',
+                     '*.png']
+                }
+
+packages = find_packages()
+print('packages are', packages)
+
+setup(
+    name='testapp_vispy',
+    version='1.1',
+    description='p4a setup.py test',
+    author='Alexander Taylor',
+    author_email='[email protected]',
+    packages=find_packages(),
+    options=options,
+    package_data={'testapp_vispy': ['*.py', '*.png']}
+)

testapps/testapp/main.py

@@ -3,15 +3,10 @@
 import os
 print('imported os')
 
-print('contents of ./lib/python2.7/site-packages/ etc.')
-print(os.listdir('./lib'))
-print(os.listdir('./lib/python2.7'))
-print(os.listdir('./lib/python2.7/site-packages'))
 
-print('contents of this dir', os.listdir('./'))
+print('this dir is', os.path.abspath(os.curdir))
 
-with open('./lib/python2.7/site-packages/kivy/app.pyo', 'rb') as fileh:
-    print('app.pyo size is', len(fileh.read()))
+print('contents of this dir', os.listdir('./'))
 
 import sys
 print('pythonpath is', sys.path)
@@ -35,6 +30,7 @@
 
 kv = '''
 #:import Metrics kivy.metrics.Metrics
+#:import sys sys
 
 <FixedSizeButton@Button>:
     size_hint_y: None
@@ -63,6 +59,14 @@
             markup: True
             text: '[b]Kivy[/b] on [b]SDL2[/b] on [b]Android[/b]!'
             halign: 'center'
+        Label:
+            height: self.texture_size[1]
+            size_hint_y: None
+            text_size: self.size[0], None
+            markup: True
+            text: sys.version
+            halign: 'center'
+            padding_y: dp(10)
         Widget:
             size_hint_y: None
             height: 20
@@ -83,7 +87,7 @@
         Widget:
             size_hint_y: None
             height: 1000
-            on_touch_down: print 'touched at', args[-1].pos
+            on_touch_down: print('touched at', args[-1].pos)
 
 <ErrorPopup>:
     title: 'Error'