mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Add COMMIT, VERSION and VERCODE recipe vars. Fixes #69
This commit is contained in:
parent
f63ea5cb86
commit
e916e5df4e
@ -575,7 +575,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
# Run a build command if one is required...
|
# Run a build command if one is required...
|
||||||
if thisbuild['build']:
|
if thisbuild['build']:
|
||||||
logging.info("Running 'build' commands in %s" % root_dir)
|
logging.info("Running 'build' commands in %s" % root_dir)
|
||||||
cmd = common.replace_config_vars(thisbuild['build'])
|
cmd = common.replace_config_vars(thisbuild['build'], thisbuild)
|
||||||
|
|
||||||
# Substitute source library paths into commands...
|
# Substitute source library paths into commands...
|
||||||
for name, number, libpath in srclibpaths:
|
for name, number, libpath in srclibpaths:
|
||||||
|
@ -1169,7 +1169,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
|
|||||||
if prepare:
|
if prepare:
|
||||||
|
|
||||||
if srclib["Prepare"]:
|
if srclib["Prepare"]:
|
||||||
cmd = replace_config_vars(srclib["Prepare"])
|
cmd = replace_config_vars(srclib["Prepare"], None)
|
||||||
|
|
||||||
p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=libdir)
|
p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=libdir)
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
@ -1220,7 +1220,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
|
|||||||
|
|
||||||
# Run an init command if one is required
|
# Run an init command if one is required
|
||||||
if build['init']:
|
if build['init']:
|
||||||
cmd = replace_config_vars(build['init'])
|
cmd = replace_config_vars(build['init'], build)
|
||||||
logging.info("Running 'init' commands in %s" % root_dir)
|
logging.info("Running 'init' commands in %s" % root_dir)
|
||||||
|
|
||||||
p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
|
p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir)
|
||||||
@ -1406,7 +1406,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
|
|||||||
if build['prebuild']:
|
if build['prebuild']:
|
||||||
logging.info("Running 'prebuild' commands in %s" % root_dir)
|
logging.info("Running 'prebuild' commands in %s" % root_dir)
|
||||||
|
|
||||||
cmd = replace_config_vars(build['prebuild'])
|
cmd = replace_config_vars(build['prebuild'], build)
|
||||||
|
|
||||||
# Substitute source library paths into prebuild commands
|
# Substitute source library paths into prebuild commands
|
||||||
for name, number, libpath in srclibpaths:
|
for name, number, libpath in srclibpaths:
|
||||||
@ -1874,12 +1874,16 @@ def add_to_env_path(path):
|
|||||||
env['PATH'] = os.pathsep.join(paths)
|
env['PATH'] = os.pathsep.join(paths)
|
||||||
|
|
||||||
|
|
||||||
def replace_config_vars(cmd):
|
def replace_config_vars(cmd, build):
|
||||||
global env
|
global env
|
||||||
cmd = cmd.replace('$$SDK$$', config['sdk_path'])
|
cmd = cmd.replace('$$SDK$$', config['sdk_path'])
|
||||||
# env['ANDROID_NDK'] is set in build_local right before prepare_source
|
# env['ANDROID_NDK'] is set in build_local right before prepare_source
|
||||||
cmd = cmd.replace('$$NDK$$', env['ANDROID_NDK'])
|
cmd = cmd.replace('$$NDK$$', env['ANDROID_NDK'])
|
||||||
cmd = cmd.replace('$$MVN3$$', config['mvn3'])
|
cmd = cmd.replace('$$MVN3$$', config['mvn3'])
|
||||||
|
if build is not None:
|
||||||
|
cmd = cmd.replace('$$COMMIT$$', build['commit'])
|
||||||
|
cmd = cmd.replace('$$VERSION$$', build['version'])
|
||||||
|
cmd = cmd.replace('$$VERCODE$$', build['vercode'])
|
||||||
return cmd
|
return cmd
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user