From 8a99fb3da407343e364afa2483b3d3cf90315171 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 20 May 2013 21:00:31 +0100 Subject: [PATCH] A few corrections to 9efa5227 (srclib/extlib) --- fdroidserver/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 29a75d69..aa80bfcc 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -196,6 +196,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force): ftp.mkdir('build') ftp.chdir('build') ftp.mkdir('extlib') + ftp.mkdir('srclib') # Copy the main app source code if os.path.exists(build_dir): send_dir(build_dir) @@ -216,14 +217,14 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force): if 'srclibs' in thisbuild: for lib in thisbuild['srclibs'].split(';'): name, _ = lib.split('@') - srclibpaths.append((name, common.getsrclib(lib, 'build/extlib', sdk_path, basepath=True))) + srclibpaths.append((name, common.getsrclib(lib, 'build/srclib', sdk_path, basepath=True))) # If one was used for the main source, add that too. basesrclib = vcs.getsrclib() if basesrclib: srclibpaths.append(basesrclib) for _, lib in srclibpaths: print "Sending srclib '" + lib + "'" - ftp.chdir('/home/vagrant/build/extlib') + ftp.chdir('/home/vagrant/build/srclib') if not os.path.exists(lib): raise BuildException("Missing srclib directory '" + lib + "'") send_dir(lib)