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

Merge pull request #251 from kiwix/fix_deploy 

Fix deploy
This commit is contained in:
Matthieu Gautier 2018-09-05 20:44:58 +02:00 committed by GitHub
parent a91d85fa41 ecc6927de8
commit 691dab52be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kiwixbuild/dependencies/base.py
View File

@ -24,7 +24,10 @@ class Dependency(metaclass=_MetaDependency):
@classmethod @classmethod
def version(cls): 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 @classmethod
def full_name(cls): def full_name(cls):
@ -399,6 +402,15 @@ class QMakeBuilder(MakeBuilder):
) )
run_command(command, self.build_path, context, buildEnv=self.buildEnv) 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): class MesonBuilder(Builder):
configure_option = "" configure_option = ""

11
travis/compile_all.py
View File

@ -353,15 +353,18 @@ if make_release and PLATFORM == 'native_dyn':
else: else:
out_dir = DIST_ZIM_ARCHIVES_DIR 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: try:
(out_dir/target).mkdir(parents=True) (out_dir/target).mkdir(parents=True)
except FileExistsError: except FileExistsError:
pass pass
in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format( full_target_name = "{}-{}".format(target, main_project_versions[target])
target, if target != 'kiwix-desktop':
main_project_versions[target]) 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(): if in_file.exists():
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':