diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index 1c04f74..940b3b3 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -24,7 +24,10 @@ class Dependency(metaclass=_MetaDependency): @classmethod def version(cls): - return base_deps_versions.get(cls.name, None) + if cls.name in base_deps_versions: + return base_deps_versions[cls.name] + else: + return main_project_versions.get(cls.name, None) @classmethod def full_name(cls): @@ -399,6 +402,15 @@ class QMakeBuilder(MakeBuilder): ) run_command(command, self.build_path, context, buildEnv=self.buildEnv) + def _make_dist(self, context): + command = "git archive -o {build_dir}/{name}.tar.gz --prefix={name}/ HEAD" + command = command.format( + build_dir = self.build_path, + name = self.target.full_name() + ) + run_command(command, self.source_path, context, buildEnv=self.buildEnv) + + class MesonBuilder(Builder): configure_option = "" diff --git a/travis/compile_all.py b/travis/compile_all.py index 463b949..2a8d212 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -353,15 +353,18 @@ if make_release and PLATFORM == 'native_dyn': else: out_dir = DIST_ZIM_ARCHIVES_DIR - if target in ('kiwix-lib', 'kiwix-tools', 'libzim', 'zim-tools', 'zimwriterfs'): + if target in ('kiwix-lib', 'kiwix-tools', 'libzim', 'zim-tools', 'zimwriterfs', 'kiwix-desktop'): try: (out_dir/target).mkdir(parents=True) except FileExistsError: pass - in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format( - target, - main_project_versions[target]) + full_target_name = "{}-{}".format(target, main_project_versions[target]) + if target != 'kiwix-desktop': + in_file = BASE_DIR/full_target_name/'meson-dist'/'{}.tar.xz'.format( + full_target_name) + else: + in_file = BASE_DIR/full_target_name/'{}.tar.gz'.format(full_target_name) if in_file.exists(): shutil.copy(str(in_file), str(out_dir/target)) elif PLATFORM == 'native_static':