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

metadata output-lines now substitute $$VERSION$$/etc.

Browse source
This commit is contained in:
Michael Pöhn 2017-03-16 09:23:28 +01:00
parent 0ef818486d
commit d2570a493e
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
fdroidserver/common.py
View file

@ -1917,15 +1917,20 @@ def set_FDroidPopen_env(build=None):
env[n] = build.ndk_path()
def replace_build_vars(cmd, build):
cmd = cmd.replace('$$COMMIT$$', build.commit)
cmd = cmd.replace('$$VERSION$$', build.versionName)
cmd = cmd.replace('$$VERCODE$$', build.versionCode)
return cmd
def replace_config_vars(cmd, build):
cmd = cmd.replace('$$SDK$$', config['sdk_path'])
cmd = cmd.replace('$$NDK$$', build.ndk_path())
cmd = cmd.replace('$$MVN3$$', config['mvn3'])
cmd = cmd.replace('$$QT$$', config['qt_sdk_path'] or '')
if build is not None:
cmd = cmd.replace('$$COMMIT$$', build.commit)
cmd = cmd.replace('$$VERSION$$', build.versionName)
cmd = cmd.replace('$$VERCODE$$', build.versionCode)
cmd = replace_build_vars(cmd, build)
return cmd