kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 06:20:12 +01:00
Code Activity

New build flag: output= for e.g. full make builds

Browse Source
This commit is contained in:
Daniel Martí 2014-01-28 22:14:53 +01:00
parent 8bbe38f172
commit 13bcd38372
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/build.py
View File

@ -618,7 +618,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
bindir = os.path.join(root_dir, 'bin') bindir = os.path.join(root_dir, 'bin')
if p.returncode != 0: if p is not None and p.returncode != 0:
raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout) raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
print "Successfully built version " + thisbuild['version'] + ' of ' + app['id'] print "Successfully built version " + thisbuild['version'] + ' of ' + app['id']
@ -655,6 +655,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk, src = re.match(r".*^.*Creating (.+) for release.*$.*", stdout_apk,
re.S|re.M).group(1) re.S|re.M).group(1)
src = os.path.join(bindir, src) src = os.path.join(bindir, src)
elif thisbuild['type'] == 'raw':
src = os.path.join(root_dir, thisbuild['output'])
src = os.path.normpath(src)
# Make sure it's not debuggable... # Make sure it's not debuggable...
if common.isApkDebuggable(src, config): if common.isApkDebuggable(src, config):

4
fdroidserver/metadata.py
View File

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