smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TRAVIS] Fix release dist. 

- Correctly make dist.
- zimwriterfs is now using meson, we don't need a special case.
This commit is contained in:
Matthieu Gautier 2018-06-19 10:39:07 +02:00
parent aeffb90f1f
commit d5b81294ca
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/builder.py
View File

@ -117,7 +117,7 @@ class Builder:
builderDefs = (tDef for tDef in target_steps() if tDef[0] != 'source') builderDefs = (tDef for tDef in target_steps() if tDef[0] != 'source')
for builderDef in builderDefs: for builderDef in builderDefs:
builder = get_target_step(builderDef) 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])) print("make dist {} ({}):".format(builder.name, builderDef[0]))
builder.make_dist() builder.make_dist()
continue continue

6
travis/compile_all.py
View File

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