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

Handle split path srclibs properly on buildserver

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-09-20 14:16:08 +01:00
parent 8983aaf2f9
commit ea8d90040e
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/build.py
View file

@ -179,14 +179,16 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path):
if thisbuild.has_key('srclibs'):
for lib in thisbuild['srclibs'].split(';'):
name, _ = lib.split('@')
srclibpaths.append((name, common.getsrclib(lib, 'build/extlib', sdk_path)))
srclibpaths.append((name, common.getsrclib(lib, 'build/extlib', sdk_path, basepath=True)))
# If one was used for the main source, add that too.
basesrclib = vcs.getsrclib()
if basesrclib:
srclibpaths.append(basesrclib)
print "Sending srclibs:"
for _, lib in srclibpaths:
print "Sending srclib '" + lib + "'"
ftp.chdir('/home/vagrant/build/extlib')
if not os.path.exists(lib):
raise BuildException("Missing srclib directory '" + lib + "'")
send_dir(lib)
# Execute the build script...