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

Reuse the versions in dependency_versions.py instead of redefine them.

This commit is contained in:
Matthieu Gautier 2018-03-16 10:43:56 +01:00
parent f0391a638b
commit f1c15a5d3d
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
travis/compile_all.py
View File

@ -9,6 +9,9 @@ import tarfile
import subprocess import subprocess
import re import re
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import dependency_versions
PLATFORM = environ['PLATFORM'] PLATFORM = environ['PLATFORM']
def home(): def home():
@ -22,14 +25,6 @@ DIST_KIWIX_ARCHIVES_DIR = home()/'DIST_KIWIX_ARCHIVES'
DIST_ZIM_ARCHIVES_DIR = home()/'DIST_ZIM_ARCHIVES' DIST_ZIM_ARCHIVES_DIR = home()/'DIST_ZIM_ARCHIVES'
SSH_KEY = Path(environ['TRAVIS_BUILD_DIR'])/'travis'/'travisci_builder_id_key' SSH_KEY = Path(environ['TRAVIS_BUILD_DIR'])/'travis'/'travisci_builder_id_key'
VERSIONS = {
'kiwix-lib': '1.0.2',
'kiwix-tools': '0.3.0',
'libzim': '3.0.0',
'zim-tools': '0.0.1',
'zimwriterfs': '1.1'
}
# We have build everything. Now create archives for public deployement. # We have build everything. Now create archives for public deployement.
BINARIES = { BINARIES = {
'kiwix-tools': ('kiwix-install', 'kiwix-manage', 'kiwix-read', 'kiwix-search', 'kiwix-serve'), 'kiwix-tools': ('kiwix-install', 'kiwix-manage', 'kiwix-read', 'kiwix-search', 'kiwix-serve'),
@ -74,7 +69,7 @@ def make_archive(project, platform):
if platform == "win32": if platform == "win32":
file_to_archives = ['{}.exe'.format(f) for f in file_to_archives] file_to_archives = ['{}.exe'.format(f) for f in file_to_archives]
if make_release: if make_release:
postfix = VERSIONS[project] postfix = dependency_versions.main_project_versions[project]
if project in ('kiwix-lib', 'kiwix-tools'): if project in ('kiwix-lib', 'kiwix-tools'):
archive_dir = RELEASE_KIWIX_ARCHIVES_DIR/project archive_dir = RELEASE_KIWIX_ARCHIVES_DIR/project
else: else:
@ -171,10 +166,6 @@ for target in TARGETS:
# We have build everything. Now create archives for public deployement. # We have build everything. Now create archives for public deployement.
kiwix_tools_postfix = VERSIONS['kiwix-tools'] if make_release else _date
zim_tools_postfix = VERSIONS['zim-tools'] if make_release else _date
zimwriterfs_postfix = VERSIONS['zimwriterfs'] if make_release else _date
if make_release and PLATFORM == 'native_dyn': if make_release and PLATFORM == 'native_dyn':
for target in TARGETS: for target in TARGETS:
if target in ('kiwix-lib', 'kiwix-tools'): if target in ('kiwix-lib', 'kiwix-tools'):
@ -183,10 +174,14 @@ if make_release and PLATFORM == 'native_dyn':
out_dir = DIST_ZIM_ARCHIVES_DIR out_dir = DIST_ZIM_ARCHIVES_DIR
if target in ('kiwix-lib', 'kiwix-tools', 'libzim', 'zim-tools'): if target in ('kiwix-lib', 'kiwix-tools', 'libzim', 'zim-tools'):
shutil.copy(str(BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format(target, VERSIONS[target])), shutil.copy(str(BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format(
target,
dependency_versions.main_project_versions[target])),
str(out_dir)) str(out_dir))
if target in ('zimwriterfs',): if target in ('zimwriterfs',):
shutil.copy(str(BASE_DIR/target/'{}-{}.tar.gz'.format(target, VERSIONS[target])), shutil.copy(str(BASE_DIR/target/'{}-{}.tar.gz'.format(
target,
dependency_versions.main_project_versions[target])),
str(out_dir)) str(out_dir))
elif PLATFORM == 'native_static': elif PLATFORM == 'native_static':
for target in ('kiwix-tools', 'zim-tools', 'zimwriterfs'): for target in ('kiwix-tools', 'zim-tools', 'zimwriterfs'):