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

Remove LibkiwixApp

Browse Source 
The project was used to assemble all android compilation in one
multiplatform java archive.

This allow use to remove android_sdk and Gradle builder
This commit is contained in:
Matthieu Gautier
2022-06-09 10:28:59 +02:00
parent 9c4f359170
commit 72c271a74c
10 changed files with 8 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ else:
RELEASE = True
if PLATFORM_TARGET == "android":
TARGETS = ("libkiwix-app",)
TARGETS = ("libkiwix",)
elif PLATFORM_TARGET.startswith("iOS"):
TARGETS = ("libzim", "libkiwix")
elif PLATFORM_TARGET.startswith("native_"):
@ -56,8 +56,6 @@ else:
# Filter what to build if we are doing a release.
if RELEASE:
def release_filter(project):
if project == "libkiwix-app":
project = "libkiwix"
return release_versions.get(project) is not None
TARGETS = tuple(filter(release_filter, TARGETS))
@ -109,7 +107,7 @@ if RELEASE:
if PLATFORM_TARGET == "flatpak" and "kiwix-desktop" in TARGETS:
update_flathub_git()
if PLATFORM_TARGET == "android" and "libkiwix-app" in TARGETS:
if PLATFORM_TARGET == "android" and "libkiwix" in TARGETS:
postfix = get_postfix("libkiwix")
basename = "kiwixlib-{}".format(postfix)

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

@ -134,9 +134,7 @@ def run_kiwix_build(
command.append("--hide-progress")
command.append("--fast-clone")
command.append("--assume-packages-installed")
if target == "libkiwix-app" and platform.startswith("android_"):
command.extend(["--target-platform", "android", "--android-arch", platform[8:]])
elif platform == "android":
if platform == "android":
command.extend(["--target-platform", "android"])
for arch in ("arm", "arm64", "x86", "x86_64"):
command.extend(["--android-arch", arch])
@ -245,7 +243,6 @@ def make_deps_archive(target=None, name=None, full=False):
if (base_dir / "meson_cross_file.txt").exists():
files_to_archive.append(base_dir / "meson_cross_file.txt")
files_to_archive += HOME.glob("BUILD_*/android-ndk*")
files_to_archive += HOME.glob("BUILD_*/android-sdk*")
if (BASE_DIR / "meson_cross_file.txt").exists():
files_to_archive.append(BASE_DIR / "meson_cross_file.txt")