LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made p4a distribution dir name == app.package.name

Browse source
This commit is contained in:
Alexander Taylor 2013-11-08 22:17:08 +00:00
parent b72176095d
commit 1fcae9834f
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
buildozer/targets/android.py
View file

@ -300,9 +300,7 @@ class TargetAndroid(Target):
cmd = self.buildozer.cmd
self.pa_dir = pa_dir = join(self.buildozer.platform_dir, 'python-for-android')
if not self.buildozer.file_exists(pa_dir):
print ' FILE NOT EXISTS'
buildozer_p4a_dir = os.environ.get('BUILDOZER_P4A_DIR')
print '!!!', buildozer_p4a_dir
if buildozer_p4a_dir:
cmd('ln -s {} ./python-for-android'.format(buildozer_p4a_dir),
cwd = self.buildozer.platform_dir)
@ -357,7 +355,9 @@ class TargetAndroid(Target):
need_compile = 0
if last_requirements != android_requirements:
need_compile = 1
if not self.buildozer.file_exists(self.pa_dir, 'dist', 'default', 'build.py'):
dist_name = self.buildozer.config.get('app', 'package.name')
if not self.buildozer.file_exists(self.pa_dir, 'dist', dist_name, 'build.py'):
need_compile = 1
if not need_compile:
@ -367,8 +367,9 @@ class TargetAndroid(Target):
modules_str = ' '.join(android_requirements)
cmd = self.buildozer.cmd
self.buildozer.debug('Clean and build python-for-android')
cmd('git clean -dxf', cwd=self.pa_dir)
cmd('./distribute.sh -m "{0}"'.format(modules_str), cwd=self.pa_dir)
# cmd('git clean -dxf', cwd=self.pa_dir)
cmd('./distribute.sh -m "{0}" -d "{1}"'.format(modules_str, dist_name),
cwd=self.pa_dir)
self.buildozer.debug('Remove temporary build files')
self.buildozer.rmdir(join(self.pa_dir, 'build'))
self.buildozer.rmdir(join(self.pa_dir, '.packages'))
@ -388,7 +389,8 @@ class TargetAndroid(Target):
return package.lower()
def build_package(self):
dist_dir = join(self.pa_dir, 'dist', 'default')
dist_name = self.buildozer.config.get('app', 'package.name')
dist_dir = join(self.pa_dir, 'dist', dist_name)
config = self.buildozer.config
package = self._get_package()
version = self.buildozer.get_version()