From 33c2ec2c4d9a00080e5e17a8a8823bf2314b40e4 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 28 Jun 2022 12:24:06 +0200 Subject: [PATCH] Build and release libzim for android on the CI --- .github/scripts/build_projects.py | 6 +++--- .github/scripts/build_release_nightly.py | 4 +--- .github/scripts/common.py | 13 ++++++++++--- .github/scripts/compile_all_deps.py | 4 +--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/scripts/build_projects.py b/.github/scripts/build_projects.py index b8adf1b..85de128 100755 --- a/.github/scripts/build_projects.py +++ b/.github/scripts/build_projects.py @@ -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": diff --git a/.github/scripts/build_release_nightly.py b/.github/scripts/build_release_nightly.py index 4fe4f32..ab5adc5 100755 --- a/.github/scripts/build_release_nightly.py +++ b/.github/scripts/build_release_nightly.py @@ -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": diff --git a/.github/scripts/common.py b/.github/scripts/common.py index 35749dd..5322451 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -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] diff --git a/.github/scripts/compile_all_deps.py b/.github/scripts/compile_all_deps.py index ead36c0..f7d471d 100755 --- a/.github/scripts/compile_all_deps.py +++ b/.github/scripts/compile_all_deps.py @@ -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":