Merge pull request #196 from kiwix/fix_release_build_bis

[TRAVIS] Fix release dist.
This commit is contained in:
Matthieu Gautier 2018-06-19 11:46:54 +02:00 committed by GitHub
commit d0ecf70284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 10 deletions

View File

@ -117,7 +117,7 @@ class Builder:
builderDefs = (tDef for tDef in target_steps() if tDef[0] != 'source')
for builderDef in builderDefs:
builder = get_target_step(builderDef)
if option('make_dist') and builderDef == option('target'):
if option('make_dist') and builderDef[1] == option('target'):
print("make dist {} ({}):".format(builder.name, builderDef[0]))
builder.make_dist()
continue

View File

@ -313,15 +313,9 @@ if make_release and PLATFORM == 'native_dyn':
except FileExistsError:
pass
if target == 'zimwriterfs':
in_file = BASE_DIR/target/'{}-{}.tar.gz'.format(
target,
main_project_versions[target])
else:
in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format(
target,
main_project_versions[target])
in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format(
target,
main_project_versions[target])
shutil.copy(str(in_file), str(out_dir/target))
elif PLATFORM == 'native_static':
for target in ('kiwix-tools', 'zim-tools', 'zimwriterfs'):