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

Push a more complete/standard fdroidserver layout to buildserver

Browse source
This commit is contained in:
Ciaran Gultnieks 2015-09-24 09:19:17 +00:00
parent 27a5dc8429
commit 84573e4e5c
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
fdroidserver/build.py
View file

@ -299,11 +299,13 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
logging.info("Preparing server for build...") logging.info("Preparing server for build...")
serverpath = os.path.abspath(os.path.dirname(__file__)) serverpath = os.path.abspath(os.path.dirname(__file__))
ftp.put(os.path.join(serverpath, 'build.py'), 'build.py') ftp.mkdir('fdroidserver')
ftp.put(os.path.join(serverpath, 'common.py'), 'common.py') ftp.chdir('fdroidserver')
ftp.put(os.path.join(serverpath, 'scanner.py'), 'scanner.py') ftp.put(os.path.join(serverpath, '..', 'fdroid'), 'fdroid')
ftp.put(os.path.join(serverpath, 'net.py'), 'net.py') ftp.chmod('fdroid', 0o755)
ftp.put(os.path.join(serverpath, 'metadata.py'), 'metadata.py') send_dir(os.path.join(serverpath))
ftp.chdir(homedir)
ftp.put(os.path.join(serverpath, '..', 'buildserver', ftp.put(os.path.join(serverpath, '..', 'buildserver',
'config.buildserver.py'), 'config.py') 'config.buildserver.py'), 'config.py')
ftp.chmod('config.py', 0o600) ftp.chmod('config.py', 0o600)
@ -381,7 +383,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
logging.info("Starting build...") logging.info("Starting build...")
chan = sshs.get_transport().open_session() chan = sshs.get_transport().open_session()
chan.get_pty() chan.get_pty()
cmdline = 'python build.py --on-server' cmdline = os.path.join(homedir, 'fdroidserver', 'fdroid')
cmdline += ' build --on-server'
if force: if force:
cmdline += ' --force --test' cmdline += ' --force --test'
if options.verbose: if options.verbose: