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

Try to fix srclibs on server builds

Browse Source
This commit is contained in:
Daniel Martí 2013-11-18 10:24:02 +01:00
parent 93b2dca3a3
commit cb282217d6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdroidserver/build.py
View File

@ -285,11 +285,19 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
srclibpaths = [] srclibpaths = []
if 'srclibs' in thisbuild: if 'srclibs' in thisbuild:
for lib in thisbuild['srclibs'].split(';'): for lib in thisbuild['srclibs'].split(';'):
number = None
subdir = None
lib = lib.strip() lib = lib.strip()
name, _ = lib.split('@') name, ref = lib.split('@')
if ':' in name:
number, name = name.split(':', 1)
if '/' in name:
name, subdir = name.split('/',1)
if options.verbose: if options.verbose:
print "Processing srclib '" + name + "'" print "Processing srclib '" + name + "'"
srclibpaths.append((name, common.getsrclib(lib, 'build/srclib', basepath=True, prepare=False))) libpath = common.getsrclib(name+'@'+ref, 'build/srclib', srclibpaths, subdir, basepath=True, prepare=False)
srclibpaths.append((name, number, libpath))
# If one was used for the main source, add that too. # If one was used for the main source, add that too.
basesrclib = vcs.getsrclib() basesrclib = vcs.getsrclib()
if basesrclib: if basesrclib: