From d5b81294cad67855509f298531b7f9ddbfb4f767 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 19 Jun 2018 10:39:07 +0200 Subject: [PATCH] [TRAVIS] Fix release dist. - Correctly make dist. - zimwriterfs is now using meson, we don't need a special case. --- kiwixbuild/builder.py | 2 +- travis/compile_all.py | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/kiwixbuild/builder.py b/kiwixbuild/builder.py index b690592..d58301a 100644 --- a/kiwixbuild/builder.py +++ b/kiwixbuild/builder.py @@ -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 diff --git a/travis/compile_all.py b/travis/compile_all.py index dba1881..d332044 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -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'):