From cd93f9bfe90669d9e656a2c798672cb60c273da6 Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Thu, 8 Dec 2016 18:17:14 +0100 Subject: [PATCH 01/10] ignores --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index c42423a..88b1184 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,10 @@ pip-log.txt #Mr Developer .mr.developer.cfg MANIFEST + +# Eclipse +.project +.pydevproject + +# Custom virtualenv location +venv From 90981b4e55f171280c773a2fb4733bc09e921373 Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Thu, 8 Dec 2016 18:21:24 +0100 Subject: [PATCH 02/10] More ignores, use rnixx fork of python-for-android --- .gitignore | 1 + buildozer/targets/android.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 88b1184..f76e722 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ MANIFEST # Eclipse .project .pydevproject +.settings # Custom virtualenv location venv diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 2816c3a..dddaaa4 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -480,7 +480,7 @@ class TargetAndroid(Target): if not self.buildozer.file_exists(pa_dir): cmd( ('git clone -b {} --single-branch ' - 'https://github.com/kivy/python-for-android.git ' + 'https://github.com/rnixx/python-for-android.git ' '{}').format(source, self.p4a_directory), cwd=self.buildozer.platform_dir) elif self.platform_update: From b1f34c75fdff26698695613bac04d7e82f9a056f Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Tue, 13 Dec 2016 14:56:26 +0100 Subject: [PATCH 03/10] Add presplash background color support for android when using the new toolchain --- buildozer/default.spec | 7 +++++++ buildozer/targets/android_new.py | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/buildozer/default.spec b/buildozer/default.spec index af60c30..12c9274 100644 --- a/buildozer/default.spec +++ b/buildozer/default.spec @@ -71,6 +71,13 @@ orientation = landscape # (bool) Indicate if the application should be fullscreen or not fullscreen = 1 +# (string) Presplash background color (for new android toolchain) +# Supported formats are: #RRGGBB #AARRGGBB or one of the following names: +# red, blue, green, black, white, gray, cyan, magenta, yellow, lightgray, +# darkgray, grey, lightgrey, darkgrey, aqua, fuchsia, lime, maroon, navy, +# olive, purple, silver, teal. +#android.presplash_color = #FFFFFF + # (list) Permissions #android.permissions = INTERNET diff --git a/buildozer/targets/android_new.py b/buildozer/targets/android_new.py index 7b65bb2..072b285 100644 --- a/buildozer/targets/android_new.py +++ b/buildozer/targets/android_new.py @@ -98,6 +98,12 @@ class TargetAndroidNew(TargetAndroid): else: cmd.extend(args) + # support for presplash background color + presplash_color = self.buildozer.config.getdefault('app', 'android.presplash_color', None) + if presplash_color: + cmd.append('--presplash-color') + cmd.append(presplash_color) + # support for services services = self.buildozer.config.getlist('app', 'services', []) for service in services: From e718520c6c3304359962094970af307df1823441 Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Tue, 13 Dec 2016 15:22:49 +0100 Subject: [PATCH 04/10] Presplash color needs to be passed in single quotes --- 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 072b285..ba34099 100644 --- a/buildozer/targets/android_new.py +++ b/buildozer/targets/android_new.py @@ -102,7 +102,7 @@ class TargetAndroidNew(TargetAndroid): presplash_color = self.buildozer.config.getdefault('app', 'android.presplash_color', None) if presplash_color: cmd.append('--presplash-color') - cmd.append(presplash_color) + cmd.append("'{}'".format(presplash_color)) # support for services services = self.buildozer.config.getlist('app', 'services', []) From 827f943698f5e6fd9cffda22b9cd877821e98cee Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Wed, 11 Oct 2017 11:26:08 +0200 Subject: [PATCH 05/10] use kivy p4a again --- buildozer/targets/android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 2919aa8..9914000 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -500,7 +500,7 @@ class TargetAndroid(Target): if not self.buildozer.file_exists(pa_dir): cmd( ('git clone -b {} --single-branch ' - 'https://github.com/rnixx/python-for-android.git ' + 'https://github.com/kivy/python-for-android.git ' '{}').format(source, self.p4a_directory), cwd=self.buildozer.platform_dir) elif self.platform_update: From 075e11ab3b61cffc22a977ecee2f7eb826c0a686 Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Wed, 11 Oct 2017 12:44:30 +0200 Subject: [PATCH 06/10] Properly decode lines in targets.android.TargetAndroid._update_libraries_references --- buildozer/targets/android.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index 9914000..b36b3d7 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -850,10 +850,11 @@ class TargetAndroid(Target): # recreate the project.properties with io.open(project_fn, 'w', encoding='utf-8') as fd: - try: - fd.writelines((line.encode('utf-8') for line in content)) - except: - fd.writelines(content) + lines = [ + line if isinstance(line, unicode) else line.decode('utf-8') + for line in content + ] + fd.writelines(lines) if not content[-1].endswith(u'\n'): fd.write(u'\n') for index, ref in enumerate(references): From a0ece89e754fee6b26182f68616982cf658ed14d Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Wed, 11 Oct 2017 12:46:57 +0200 Subject: [PATCH 07/10] Remove duplicate setting in default.spec --- buildozer/default.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/buildozer/default.spec b/buildozer/default.spec index 4f84bca..78ba4bc 100644 --- a/buildozer/default.spec +++ b/buildozer/default.spec @@ -84,13 +84,6 @@ fullscreen = 0 # olive, purple, silver, teal. #android.presplash_color = #FFFFFF -# (string) Presplash background color (for new android toolchain) -# Supported formats are: #RRGGBB #AARRGGBB or one of the following names: -# red, blue, green, black, white, gray, cyan, magenta, yellow, lightgray, -# darkgray, grey, lightgrey, darkgrey, aqua, fuchsia, lime, maroon, navy, -# olive, purple, silver, teal. -#android.presplash_color = #FFFFFF - # (list) Permissions #android.permissions = INTERNET From a8b0d3e3fc9e46c7d6aa2cf8904f4267392f26fa Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Wed, 11 Oct 2017 13:12:01 +0200 Subject: [PATCH 08/10] Fix path generation for android release apk name in old toolchain --- buildozer/targets/android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildozer/targets/android.py b/buildozer/targets/android.py index b36b3d7..8ca2b87 100644 --- a/buildozer/targets/android.py +++ b/buildozer/targets/android.py @@ -768,7 +768,7 @@ class TargetAndroid(Target): mode = 'debug' else: build_cmd += [("release", )] - mode = 'release' + mode = 'release-unsigned' self.execute_build_package(build_cmd) From f672f258febb6e60a8af25a9ca5bbcb561a0b08d Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Fri, 20 Oct 2017 09:35:12 +0200 Subject: [PATCH 09/10] Remove eclipse and venv related entries from ignores --- .gitignore | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7c62cb9..a3d680b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,11 +32,3 @@ MANIFEST release\.log\.utf-8\.tmp -# Eclipse -.project -.pydevproject -.settings - -# Custom virtualenv location -venv - From a424fb71941bb08ce10495f5ecc8de45021ff2b6 Mon Sep 17 00:00:00 2001 From: Robert Niederreiter Date: Fri, 20 Oct 2017 09:36:09 +0200 Subject: [PATCH 10/10] Remove superfluous blankline from ignores --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index a3d680b..3a75d55 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,3 @@ pip-log.txt MANIFEST release\.log\.utf-8\.tmp -