From 874dbe3fa5896003af29e9143bb2bf7b8f627874 Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Sat, 16 Apr 2016 19:21:13 -0500 Subject: [PATCH 1/2] add support for using custom kivy-ios source --- buildozer/default.spec | 3 +++ buildozer/targets/ios.py | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/buildozer/default.spec b/buildozer/default.spec index 52a3c73..9adebae 100644 --- a/buildozer/default.spec +++ b/buildozer/default.spec @@ -160,6 +160,9 @@ fullscreen = 1 # iOS specific # +# (str) Path to a custom kivy-ios folder +#ios.kivy_ios_dir = ../kivy-ios + # (str) Name of the certificate to use for signing the debug version # Get a list of available identities: buildozer ios list_identities #ios.codesign.debug = "iPhone Developer: ()" diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py index 910d7ce..a3f5b5e 100644 --- a/buildozer/targets/ios.py +++ b/buildozer/targets/ios.py @@ -92,12 +92,22 @@ class TargetIos(Target): def install_platform(self): cmd = self.buildozer.cmd self.ios_dir = ios_dir = join(self.buildozer.platform_dir, 'kivy-ios') + custom_kivy_ios = self.buildozer.config.getdefault('app', 'ios.kivy_ios_dir') + if custom_kivy_ios: + custom_kivy_ios = join(self.buildozer.root_dir, custom_kivy_ios) if not self.buildozer.file_exists(ios_dir): - cmd('git clone https://github.com/kivy/kivy-ios', - cwd=self.buildozer.platform_dir) + if custom_kivy_ios: + cmd('cp -r "{}" .'.format(custom_kivy_ios), cwd=self.buildozer.platform_dir) + else: + cmd('git clone https://github.com/kivy/kivy-ios', + cwd=self.buildozer.platform_dir) elif self.platform_update: - cmd('git clean -dxf', cwd=ios_dir) - cmd('git pull origin master', cwd=ios_dir) + if custom_kivy_ios: + cmd('rm -rf "{}"'.format(ios_dir)) + cmd('cp -r "{}" .'.format(custom_kivy_ios), cwd=self.buildozer.platform_dir) + else: + cmd('git clean -dxf', cwd=ios_dir) + cmd('git pull origin master', cwd=ios_dir) self.ios_deploy_dir = ios_deploy_dir = join(self.buildozer.platform_dir, 'ios-deploy') From 2a99a649406a9ad437922bb879a261603a5919cd Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Sat, 16 Apr 2016 20:55:16 -0500 Subject: [PATCH 2/2] fix custom kivy-ios dir if not named kivy-ios --- buildozer/targets/ios.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildozer/targets/ios.py b/buildozer/targets/ios.py index a3f5b5e..f354a77 100644 --- a/buildozer/targets/ios.py +++ b/buildozer/targets/ios.py @@ -97,14 +97,14 @@ class TargetIos(Target): custom_kivy_ios = join(self.buildozer.root_dir, custom_kivy_ios) if not self.buildozer.file_exists(ios_dir): if custom_kivy_ios: - cmd('cp -r "{}" .'.format(custom_kivy_ios), cwd=self.buildozer.platform_dir) + cmd('mkdir -p "{}"'.format(ios_dir)) + cmd('cp -r "{}"/* "{}"/'.format(custom_kivy_ios, ios_dir)) else: cmd('git clone https://github.com/kivy/kivy-ios', cwd=self.buildozer.platform_dir) elif self.platform_update: if custom_kivy_ios: - cmd('rm -rf "{}"'.format(ios_dir)) - cmd('cp -r "{}" .'.format(custom_kivy_ios), cwd=self.buildozer.platform_dir) + cmd('cp -r "{}"/* "{}"/'.format(custom_kivy_ios, ios_dir)) else: cmd('git clean -dxf', cwd=ios_dir) cmd('git pull origin master', cwd=ios_dir)