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

[TRAVIS] Allways use $HOME as relative path in dependencies archives. 

As we now move to multi-arch build, we may have things compiled natively
or "neutral" (as toolchains). So we cannot use the BASE_DIR as
relative_path because BASE_DIR is arch dependent.
This commit is contained in:
Matthieu Gautier 2018-07-16 09:42:14 +02:00
parent 9ab64220a3
commit 56d897d8d8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
travis/compile_all.py
View File

@ -180,7 +180,7 @@ def make_deps_archive(target, full=False):
write_manifest(manifest_file, archive_name, target, PLATFORM) write_manifest(manifest_file, archive_name, target, PLATFORM)
files_to_archive.append(manifest_file) files_to_archive.append(manifest_file)
relative_path = BASE_DIR relative_path = HOME
if full: if full:
files_to_archive += ARCHIVE_DIR.glob(".*_ok") files_to_archive += ARCHIVE_DIR.glob(".*_ok")
files_to_archive += BASE_DIR.glob('*/.*_ok') files_to_archive += BASE_DIR.glob('*/.*_ok')
@ -193,7 +193,6 @@ def make_deps_archive(target, full=False):
files_to_archive += HOME.glob('BUILD_*/pugixml-{}'.format( files_to_archive += HOME.glob('BUILD_*/pugixml-{}'.format(
base_deps_versions['pugixml'])) base_deps_versions['pugixml']))
files_to_archive += HOME.glob('**/TOOLCHAINS') files_to_archive += HOME.glob('**/TOOLCHAINS')
relative_path = HOME
counter = 50 counter = 50
with tarfile.open(str(relative_path/archive_name), 'w:gz') as tar: with tarfile.open(str(relative_path/archive_name), 'w:gz') as tar: