mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-08 08:20:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into logging

Browse source 
Conflicts:
	fdroidserver/build.py
This commit is contained in:
Daniel Martí 2014-01-29 13:57:57 +01:00
commit 72fa1891bf
6 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/metadata.py
View file

@ -471,6 +471,8 @@ def parse_metadata(metafile):
for t in ['maven', 'gradle', 'kivy']:
if build.get(t, 'no') != 'no':
return t
if 'output' in build:
return 'raw'
return 'ant'
thisinfo = {}
@ -699,7 +701,7 @@ def write_metadata(dest, app):
# This defines the preferred order for the build items - as in the
# manual, they're roughly in order of application.
keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
'gradle', 'maven', 'oldsdkloc', 'target',
'gradle', 'maven', 'output', 'oldsdkloc', 'target',
'update', 'encoding', 'forceversion', 'forcevercode', 'rm',
'fixtrans', 'fixapos', 'extlibs', 'srclibs', 'patch',
'prebuild', 'scanignore', 'scandelete', 'build', 'buildjni',