kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

A few corrections to 9efa5227 (srclib/extlib)

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-05-20 21:00:31 +01:00
parent 77a7e640ad
commit 8a99fb3da4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdroidserver/build.py
View File

@ -196,6 +196,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
ftp.mkdir('build') ftp.mkdir('build')
ftp.chdir('build') ftp.chdir('build')
ftp.mkdir('extlib') ftp.mkdir('extlib')
ftp.mkdir('srclib')
# Copy the main app source code # Copy the main app source code
if os.path.exists(build_dir): if os.path.exists(build_dir):
send_dir(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: if 'srclibs' in thisbuild:
for lib in thisbuild['srclibs'].split(';'): for lib in thisbuild['srclibs'].split(';'):
name, _ = lib.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. # If one was used for the main source, add that too.
basesrclib = vcs.getsrclib() basesrclib = vcs.getsrclib()
if basesrclib: if basesrclib:
srclibpaths.append(basesrclib) srclibpaths.append(basesrclib)
for _, lib in srclibpaths: for _, lib in srclibpaths:
print "Sending srclib '" + lib + "'" print "Sending srclib '" + lib + "'"
ftp.chdir('/home/vagrant/build/extlib') ftp.chdir('/home/vagrant/build/srclib')
if not os.path.exists(lib): if not os.path.exists(lib):
raise BuildException("Missing srclib directory '" + lib + "'") raise BuildException("Missing srclib directory '" + lib + "'")
send_dir(lib) send_dir(lib)