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

Rename dependency_versions.py to versions.py

This commit is contained in:
Matthieu Gautier 2018-05-15 12:00:20 +02:00
parent b27d1f0e17
commit fa829e1dec
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependency_utils.py
View File

@ -3,7 +3,7 @@ import os
import shutil import shutil
from kiwixbuild.utils import pj, Context, SkipCommand, extract_archive, Defaultdict, StopBuild from kiwixbuild.utils import pj, Context, SkipCommand, extract_archive, Defaultdict, StopBuild
from kiwixbuild.dependency_versions import main_project_versions, base_deps_versions from kiwixbuild.versions import main_project_versions, base_deps_versions
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))

0
kiwixbuild/dependency_versions.py → kiwixbuild/versions.py
View File

18
travis/compile_all.py
View File

@ -11,7 +11,10 @@ import re
from urllib.request import urlretrieve from urllib.request import urlretrieve
from urllib.error import URLError from urllib.error import URLError
from kiwixbuild import dependency_versions from kiwixbuild.versions import (
main_project_versions,
base_deps_versions,
base_deps_meta_version)
PLATFORM = environ['PLATFORM'] PLATFORM = environ['PLATFORM']
TRAVIS_OS_NAME = environ['TRAVIS_OS_NAME'] TRAVIS_OS_NAME = environ['TRAVIS_OS_NAME']
@ -81,7 +84,7 @@ def make_archive(project, platform):
base_bin_dir = BASE_DIR/'INSTALL'/'bin' base_bin_dir = BASE_DIR/'INSTALL'/'bin'
if make_release: if make_release:
postfix = dependency_versions.main_project_versions[project] postfix = 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:
@ -137,9 +140,9 @@ def make_deps_archive(target, full=False):
files_to_archive += BASE_DIR.glob('*/.*_ok') files_to_archive += BASE_DIR.glob('*/.*_ok')
files_to_archive += SOURCE_DIR.glob('*/.*_ok') files_to_archive += SOURCE_DIR.glob('*/.*_ok')
files_to_archive += [SOURCE_DIR/'pugixml-{}'.format( files_to_archive += [SOURCE_DIR/'pugixml-{}'.format(
dependency_versions.base_deps_versions['pugixml'])] base_deps_versions['pugixml'])]
files_to_archive += [BASE_DIR/'pugixml-{}'.format( files_to_archive += [BASE_DIR/'pugixml-{}'.format(
dependency_versions.base_deps_versions['pugixml'])] base_deps_versions['pugixml'])]
if (TOOLCHAINS_DIR).exists(): if (TOOLCHAINS_DIR).exists():
files_to_archive.append(TOOLCHAINS_DIR) files_to_archive.append(TOOLCHAINS_DIR)
relative_path = HOME relative_path = HOME
@ -170,9 +173,8 @@ for p in (NIGHTLY_KIWIX_ARCHIVES_DIR,
make_release = re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+", environ.get('TRAVIS_TAG', '')) is not None make_release = re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+", environ.get('TRAVIS_TAG', '')) is not None
# The first thing we need to do is to (potentially) download already compiled base dependencies. # The first thing we need to do is to (potentially) download already compiled base dependencies.
BASE_DEP_VERSION = dependency_versions.base_deps_meta_version
base_dep_archive_name = "base_deps_{}_{}_{}.tar.gz".format( base_dep_archive_name = "base_deps_{}_{}_{}.tar.gz".format(
TRAVIS_OS_NAME, PLATFORM, BASE_DEP_VERSION) TRAVIS_OS_NAME, PLATFORM, base_deps_meta_version)
print_message("Getting archive {}", base_dep_archive_name) print_message("Getting archive {}", base_dep_archive_name)
try: try:
@ -263,11 +265,11 @@ if make_release and PLATFORM == 'native_dyn':
if target == 'zimwriterfs': if target == 'zimwriterfs':
in_file = BASE_DIR/target/'{}-{}.tar.gz'.format( in_file = BASE_DIR/target/'{}-{}.tar.gz'.format(
target, target,
dependency_versions.main_project_versions[target]) main_project_versions[target])
else: else:
in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format( in_file = BASE_DIR/target/'meson-dist'/'{}-{}.tar.xz'.format(
target, target,
dependency_versions.main_project_versions[target]) main_project_versions[target])
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':