mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 23:10:29 +03:00
Some more kivy wip
This commit is contained in:
parent
53781f913b
commit
62e03f84f7
5 changed files with 5 additions and 24 deletions
|
|
@ -539,19 +539,13 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||
bconfig = ConfigParser(defaults, allow_no_value=True)
|
||||
bconfig.read(spec)
|
||||
|
||||
distdir = 'python-for-android/dist/fdroid'
|
||||
if os.path.exists(distdir):
|
||||
shutil.rmtree(distdir)
|
||||
|
||||
modules = bconfig.get('app', 'requirements').split(',')
|
||||
|
||||
cmd = 'ANDROIDSDK=' + config['sdk_path']
|
||||
cmd += ' ANDROIDNDK=' + config['ndk_path']
|
||||
cmd += ' ANDROIDNDKVER=r9'
|
||||
cmd += ' ANDROIDAPI=' + str(bconfig.get('app', 'android.api'))
|
||||
cmd += ' ./distribute.sh'
|
||||
cmd += ' -m ' + "'" + ' '.join(modules) + "'"
|
||||
cmd += ' -d fdroid'
|
||||
cmd += ' -m ' + bconfig.get('app', 'requirements')
|
||||
if subprocess.call(cmd, cwd='python-for-android', shell=True) != 0:
|
||||
raise BuildException("Distribute build failed")
|
||||
|
||||
|
|
@ -583,7 +577,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||
cmd.extend(['--icon', os.path.join(root_dir, icon)])
|
||||
|
||||
cmd.append('release')
|
||||
p = FDroidPopen(cmd, cwd=distdir)
|
||||
p = FDroidPopen(cmd, cwd='python-for-android/dist/default')
|
||||
|
||||
elif thisbuild.get('gradle', 'no') != 'no':
|
||||
print "Building Gradle project..."
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue