diff --git a/buildozer/targets/osx.py b/buildozer/targets/osx.py index 55a52ca7b..bb07b4270 100644 --- a/buildozer/targets/osx.py +++ b/buildozer/targets/osx.py @@ -30,7 +30,7 @@ def ensure_sdk(self): self.logger.info('kivy-sdk-packager does not exist, clone it') platdir = self.buildozer.platform_dir buildops.download( - 'https://github.com/kivy/kivy-sdk-packager/archive/master.zip', + 'https://github.com/kivy/kivy-sdk-packager/archive/', 'master.zip', cwd=platdir) buildops.file_extract( @@ -48,7 +48,7 @@ def download_kivy(self, cwd): self.logger.info('Downloading kivy...') try: buildops.download( - f'https://kivy.org/downloads/{current_kivy_vers}/Kivy.dmg', + f'https://kivy.org/downloads/{current_kivy_vers}/', 'Kivy.dmg', cwd=cwd ) @@ -63,8 +63,8 @@ def download_kivy(self, cwd): self.logger.info('Extracting and installing Kivy...') check_call(('hdiutil', 'attach', cwd + '/Kivy.dmg')) - buildops.file_copy( - '/Volumes/Kivy/Kivy.app', './Kivy.app', cwd=cwd) + buildops.file_copytree( + '/Volumes/Kivy/Kivy.app', cwd+'/Kivy.app') def ensure_kivyapp(self): self.logger.info('check if Kivy.app exists in local dir') @@ -128,11 +128,13 @@ def build_package(self): cwd=cwd) self.logger.info('{}.dmg created'.format(package_name)) self.logger.info('moving {}.dmg to bin.'.format(package_name)) + + package_name = package_name + '.dmg' binpath = join( self.buildozer.user_build_dir or - dirname(abspath(self.buildozer.specfilename)), 'bin') - buildops.file_copytree( - join(cwd, package_name + '.dmg'), + dirname(abspath(self.buildozer.specfilename)), 'bin') + '/' + package_name + buildops.file_copy( + join(cwd, package_name), binpath) self.logger.info('All Done!')