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

Improve error output for missing extlibs

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-11-12 20:14:16 +00:00
parent 652674f4eb
commit c75aa26115
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fdroidserver/build.py
View file

@ -241,12 +241,15 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
ftp.chdir('/home/vagrant/build/extlib')
for lib in thisbuild['extlibs'].split(';'):
lib = lib.strip()
libsrc = os.path.join('build/extlib', lib)
if not os.path.exists(libsrc):
raise BuildException("Missing extlib {0}".format(libsrc))
lp = lib.split('/')
for d in lp[:-1]:
if d not in ftp.listdir():
ftp.mkdir(d)
ftp.chdir(d)
ftp.put(os.path.join('build/extlib', lib), lp[-1])
ftp.put(libsrc, lp[-1])
for _ in lp[:-1]:
ftp.chdir('..')
# Copy any srclibs that are required...

8
fdroidserver/common.py
View file

@ -1607,9 +1607,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
os.mkdir(libsdir)
for lib in build['extlibs'].split(';'):
lib = lib.strip()
if options.verbose:
print "...installing extlib {0}".format(lib)
libf = os.path.basename(lib)
shutil.copyfile(os.path.join(extlib_dir, lib),
os.path.join(libsdir, libf))
libsrc = os.path.join(extlib_dir, lib)
if not os.path.exists(libsrc):
raise BuildException("Missing extlib file {0}".format(libsrc))
shutil.copyfile(libsrc, os.path.join(libsdir, libf))
# Get required source libraries...
srclibpaths = []