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 #535 from kiwix/libzim_android

This commit is contained in:
Matthieu Gautier 2022-06-28 14:24:24 +02:00 committed by GitHub
parent 5939865e7c 33c2ec2c4d
commit fce112d4b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ci_images/bionic_builder.dockerfile vendored
View File

@ -16,7 +16,7 @@ RUN apt update -q \
# Python (2) is needed to install android-ndk
python \
# Packaged dependencies
libbz2-dev libmagic-dev uuid-dev zlib1g-dev default-jdk \
libbz2-dev libmagic-dev uuid-dev zlib1g-dev \
libmicrohttpd-dev aria2 libgtest-dev libgl-dev \
# Qt packages
qt515base qt515webengine qt515svg qt515imageformats qt515wayland \

6
.github/scripts/build_projects.py vendored
View File

@ -11,9 +11,9 @@ from common import (
DESKTOP,
)
if PLATFORM_TARGET.startswith("android_"):
TARGETS = ("libkiwix",)
elif PLATFORM_TARGET.startswith("iOS") or PLATFORM_TARGET.startswith("macOS"):
if (PLATFORM_TARGET.startswith("android_")
or PLATFORM_TARGET.startswith("iOS")
or PLATFORM_TARGET.startswith("macOS")):
TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx":

4
.github/scripts/build_release_nightly.py vendored
View File

@ -27,9 +27,7 @@ if os.environ.get('GITHUB_EVENT_NAME') == 'schedule':
else:
RELEASE = True
if PLATFORM_TARGET.startswith("android_"):
TARGETS = ("libkiwix",)
elif PLATFORM_TARGET.startswith("iOS"):
if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx":

13
.github/scripts/common.py vendored
View File

@ -93,9 +93,16 @@ EXPORT_FILES = {
"libzim": (
INSTALL_DIR,
(
"lib/x86_64-linux-gnu/libzim.so.{}".format(main_project_versions["libzim"]),
"lib/x86_64-linux-gnu/libzim.so.{}".format(
main_project_versions["libzim"][0]
"lib/{libprefix}/libzim.so".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
),
"lib/{libprefix}/libzim.so.{version}".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
version=main_project_versions["libzim"]
),
"lib/{libprefix}/libzim.so.{version}".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
version=main_project_versions["libzim"][0]
),
"lib/libzim.{}.dylib".format(
main_project_versions["libzim"][0]

4
.github/scripts/compile_all_deps.py vendored
View File

@ -12,9 +12,7 @@ from common import (
KIWIX_DESKTOP_ONLY,
)
if PLATFORM_TARGET.startswith("android_"):
TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("iOS"):
if PLATFORM_TARGET.startswith("android_") or PLATFORM_TARGET.startswith("iOS"):
TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"):
if OS_NAME == "osx":

7
kiwixbuild/dependencies/libzim.py
View File

@ -29,6 +29,7 @@ class Libzim(Dependency):
config_options = []
if platformInfo.build == 'android':
config_options.append("-DUSE_BUFFER_HEADER=false")
config_options.append("-Dstatic-linkage=true")
if platformInfo.build == 'iOS':
config_options.append("-Db_bitcode=true")
if platformInfo.name == 'native_mixed' and option('target') == 'libzim':
@ -40,3 +41,9 @@ class Libzim(Dependency):
zim_testing_suite = get_target_step('zim-testing-suite', 'source')
config_options.append('-Dtest_data_dir={}'.format(zim_testing_suite.source_path))
return " ".join(config_options)
@property
def library_type(self):
if self.buildEnv.platformInfo.build == 'android':
return 'shared'
return super().library_type

4
kiwixbuild/packages.py
View File

@ -61,7 +61,7 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _fedora_common
},
'fedora_android': {
'COMMON': _fedora_common + ['java-1.8.0-openjdk-devel']
'COMMON': _fedora_common
},
'debian_native_dyn': {
'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'],
@ -94,7 +94,7 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _debian_common,
},
'debian_android': {
'COMMON': _debian_common + ['default-jdk'],
'COMMON': _debian_common,
},
'Darwin_native_dyn': {
'COMMON': ['autoconf', 'automake', 'libtool', 'cmake', 'pkg-config'],