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

Transfer .fdroidvcs info to build server

Browse source
This commit is contained in:
Ciaran Gultnieks 2013-07-18 21:56:37 +01:00
parent ba91016168
commit 81244971ae
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/build.py
View file

@ -231,9 +231,6 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
ftp.chdir('build') ftp.chdir('build')
ftp.mkdir('extlib') ftp.mkdir('extlib')
ftp.mkdir('srclib') ftp.mkdir('srclib')
# Copy the main app source code
if os.path.exists(build_dir):
send_dir(build_dir)
# Copy any extlibs that are required... # Copy any extlibs that are required...
if 'extlibs' in thisbuild: if 'extlibs' in thisbuild:
ftp.chdir('/home/vagrant/build/extlib') ftp.chdir('/home/vagrant/build/extlib')
@ -263,12 +260,20 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
ftp.chdir('/home/vagrant/build/srclib') 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 + "'")
fv = '.fdroidvcs-' + name
ftp.put(os.path.join('build/srclib', fv), fv)
send_dir(lib) send_dir(lib)
# Copy the metadata file too... # Copy the metadata file too...
ftp.chdir('/home/vagrant/srclibs') ftp.chdir('/home/vagrant/srclibs')
ftp.put(os.path.join('srclibs', name + '.txt'), ftp.put(os.path.join('srclibs', name + '.txt'),
name + '.txt') name + '.txt')
# Copy the main app source code
# (no need if it's a srclib)
if (not basesrclib) and os.path.exists(build_dir):
ftp.chdir('/home/vagrant/build')
fv = '.fdroidvcs-' + app['id']
ftp.put(os.path.join('build', fv), fv)
send_dir(build_dir)
# Execute the build script... # Execute the build script...
print "Starting build..." print "Starting build..."