smallsolar/kiwix-build
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-build.git synced 2025-06-26 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move creation of dependencies archive into a separated function.

Browse Source
This commit is contained in:
Matthieu Gautier
2018-03-19 17:53:02 +01:00
parent e0171379c7
commit df51246753
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
travis/compile_all.py
View File

@ -89,6 +89,24 @@ def make_archive(project, platform):
arch.add(str(base_bin_dir/f), arcname=str(f)) arch.add(str(base_bin_dir/f), arcname=str(f))
def make_deps_archive(target):
(BASE_DIR/'.install_packages_ok').unlink()
archive_name = "deps_{}_{}.tar.gz".format(PLATFORM, target)
files_to_archive = [BASE_DIR/'INSTALL']
files_to_archive += BASE_DIR.glob('**/android-ndk*')
if (BASE_DIR/'meson_cross_file.txt').exists():
files_to_archive.append(BASE_DIR/'meson_cross_file.txt')
manifest_file = BASE_DIR/'manifest.txt'
write_manifest(manifest_file, archive_name, target, PLATFORM)
files_to_archive.append(manifest_file)
with tarfile.open(str(BASE_DIR/archive_name), 'w:gz') as tar:
for name in files_to_archive:
tar.add(str(name), arcname=str(name.relative_to(BASE_DIR)))
return BASE_DIR/archive_name
def scp(what, where): def scp(what, where):
command = ['scp', '-i', str(SSH_KEY), what, where] command = ['scp', '-i', str(SSH_KEY), what, where]
subprocess.check_call(command) subprocess.check_call(command)
@ -138,21 +156,8 @@ for target in TARGETS:
run_kiwix_build(target, run_kiwix_build(target,
platform=PLATFORM, platform=PLATFORM,
build_deps_only=True) build_deps_only=True)
(BASE_DIR/'.install_packages_ok').unlink() archive = make_deps_archive(target)
scp(str(archive), 'nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/')
archive_name = "deps_{}_{}.tar.gz".format(PLATFORM, target)
files_to_archive = [BASE_DIR/'INSTALL']
files_to_archive += BASE_DIR.glob('**/android-ndk*')
if (BASE_DIR/'meson_cross_file.txt').exists():
files_to_archive.append(BASE_DIR/'meson_cross_file.txt')
manifest_file = BASE_DIR/'manifest.txt'
write_manifest(manifest_file, archive_name, target, PLATFORM)
files_to_archive.append(manifest_file)
with tarfile.open(str(BASE_DIR/archive_name), 'w:gz') as tar:
for name in files_to_archive:
tar.add(str(name), arcname=str(name.relative_to(BASE_DIR)))
scp(str(BASE_DIR/archive_name), 'nightlybot@download.kiwix.org:/var/www/tmp.kiwix.org/ci/')
run_kiwix_build(target, run_kiwix_build(target,
platform=PLATFORM, platform=PLATFORM,