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

Need to push srclib metadata files to build server

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-05-22 10:17:02 +01:00
parent 8d85c7c2c3
commit b0e552d8a9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdroidserver/build.py
View File

@ -185,12 +185,14 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
# Copy the metadata - just the file for this app... # Copy the metadata - just the file for this app...
ftp.mkdir('metadata') ftp.mkdir('metadata')
ftp.mkdir('srclibs')
ftp.chdir('metadata') ftp.chdir('metadata')
ftp.put(os.path.join('metadata', app['id'] + '.txt'), ftp.put(os.path.join('metadata', app['id'] + '.txt'),
app['id'] + '.txt') app['id'] + '.txt')
# And patches if there are any... # And patches if there are any...
if os.path.exists(os.path.join('metadata', app['id'])): if os.path.exists(os.path.join('metadata', app['id'])):
send_dir(os.path.join('metadata', app['id'])) send_dir(os.path.join('metadata', app['id']))
ftp.chdir('/home/vagrant') ftp.chdir('/home/vagrant')
# Create the build directory... # Create the build directory...
ftp.mkdir('build') ftp.mkdir('build')
@ -222,12 +224,17 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
basesrclib = vcs.getsrclib() basesrclib = vcs.getsrclib()
if basesrclib: if basesrclib:
srclibpaths.append(basesrclib) srclibpaths.append(basesrclib)
for _, lib in srclibpaths: for name, lib in srclibpaths:
print "Sending srclib '" + lib + "'" print "Sending srclib '" + lib + "'"
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 + "'")
send_dir(lib) send_dir(lib)
# Copy the metadata file too...
ftp.chdir('/home/vagrant/srclibs')
ftp.put(os.path.join('srclibs', name + '.txt'),
name + '.txt')
# Execute the build script... # Execute the build script...
print "Starting build..." print "Starting build..."
@ -495,7 +502,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, also_check_dir, srclib_dir,
if os.path.exists(dest) or (not test and os.path.exists(dest_repo)): if os.path.exists(dest) or (not test and os.path.exists(dest_repo)):
return False return False
if also_check_dir: if also_check_dir and not test:
dest_also = os.path.join(also_check_dir, app['id'] + '_' + dest_also = os.path.join(also_check_dir, app['id'] + '_' +
thisbuild['vercode'] + '.apk') thisbuild['vercode'] + '.apk')
if os.path.exists(dest_also): if os.path.exists(dest_also):