From 45967285ade18616841d611a252291138aa9dd44 Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 7 Jul 2016 22:32:23 +0100 Subject: [PATCH 1/2] Always pass required args to p4a in android_new --- buildozer/targets/android_new.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildozer/targets/android_new.py b/buildozer/targets/android_new.py index 83a1f06..6e1e53f 100644 --- a/buildozer/targets/android_new.py +++ b/buildozer/targets/android_new.py @@ -14,20 +14,22 @@ class TargetAndroidNew(TargetAndroid): p4a_branch = "master" p4a_directory = "python-for-android-master" p4a_apk_cmd = "apk --bootstrap=" + extra_p4a_args = '' def __init__(self, buildozer): super(TargetAndroidNew, self).__init__(buildozer) self._build_dir = join(self.buildozer.platform_dir, 'build') - color = 'always' if USE_COLOR else 'never' self._p4a_cmd = ('python -m pythonforandroid.toolchain ') self._p4a_bootstrap = self.buildozer.config.getdefault( 'app', 'android.bootstrap', 'sdl2') - self.p4a_apk_cmd += ('{} --color={} --storage-dir={}'.format( - self._p4a_bootstrap, color, self._build_dir)) + self.p4a_apk_cmd += ('{}'.format(self._p4a_bootstrap) + color = 'always' if USE_COLOR else 'never' + self.extra_p4a_args = ' --color={} --storage-dir={}'.format( + color, self._build_dir) def _p4a(self, cmd, **kwargs): kwargs.setdefault('cwd', self.pa_dir) - return self.buildozer.cmd(self._p4a_cmd + cmd, **kwargs) + return self.buildozer.cmd(self._p4a_cmd + cmd + self.extra_p4a_args, **kwargs) def get_available_packages(self): return True From cc8aa97cb127dfbcae55708cbe121df17a6720bf Mon Sep 17 00:00:00 2001 From: Alexander Taylor Date: Thu, 7 Jul 2016 22:35:54 +0100 Subject: [PATCH 2/2] Changed trivial .format to just string --- buildozer/targets/android_new.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/targets/android_new.py b/buildozer/targets/android_new.py index 6e1e53f..c0a27f2 100644 --- a/buildozer/targets/android_new.py +++ b/buildozer/targets/android_new.py @@ -22,7 +22,7 @@ class TargetAndroidNew(TargetAndroid): self._p4a_cmd = ('python -m pythonforandroid.toolchain ') self._p4a_bootstrap = self.buildozer.config.getdefault( 'app', 'android.bootstrap', 'sdl2') - self.p4a_apk_cmd += ('{}'.format(self._p4a_bootstrap) + self.p4a_apk_cmd += self._p4a_bootstrap color = 'always' if USE_COLOR else 'never' self.extra_p4a_args = ' --color={} --storage-dir={}'.format( color, self._build_dir)