mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 23:42:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes to srclibs with paths

Browse source
This commit is contained in:
Daniel Martí 2013-11-20 19:00:22 +01:00
parent 47ec7bff2d
commit c4a5ced10a
2 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/build.py
View file

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