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

Use glob instead of specifying the lib_prefix. 

There is no need to be specific here, we are already in INSTALL_DIR which
contains only things specific to our platform.
This commit is contained in:
Matthieu Gautier 2022-11-16 11:08:26 +01:00
parent 9881571047
commit ab421848c5
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,13 +54,6 @@ PLATFORM_TO_RELEASE = {
"wasm": "wasm-emscripten", "wasm": "wasm-emscripten",
} }
LIB_PREFIX = {
"android_arm": "arm-linux-androideabi",
"android_arm64": "aarch64-linux-android",
"android_x86": "i686-linux-android",
"android_x86_64": "x86_64-linux-android",
}
FLATPAK_HTTP_GIT_REMOTE = "https://github.com/flathub/org.kiwix.desktop.git" FLATPAK_HTTP_GIT_REMOTE = "https://github.com/flathub/org.kiwix.desktop.git"
FLATPAK_GIT_REMOTE = "git@github.com:flathub/org.kiwix.desktop.git" FLATPAK_GIT_REMOTE = "git@github.com:flathub/org.kiwix.desktop.git"
@ -95,18 +88,12 @@ EXPORT_FILES = {
"libzim": ( "libzim": (
INSTALL_DIR, INSTALL_DIR,
( (
"lib/{libprefix}/libzim.a".format( "lib/*/libzim.a",
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"), "lib/*/libzim.so",
), "lib/*/libzim.so.{version}".format(
"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"] version=main_project_versions["libzim"]
), ),
"lib/{libprefix}/libzim.so.{version}".format( "lib/*/libzim.so.{version}".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
version=main_project_versions["libzim"][0] version=main_project_versions["libzim"][0]
), ),
"lib/libzim.{}.dylib".format( "lib/libzim.{}.dylib".format(
@ -119,15 +106,11 @@ EXPORT_FILES = {
"libkiwix": ( "libkiwix": (
INSTALL_DIR, INSTALL_DIR,
( (
"lib/{libprefix}/libkiwix.so".format( "lib/*/libkiwix.so",
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"), "lib/*/libkiwix.so.{version}".format(
),
"lib/{libprefix}/libkiwix.so.{version}".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
version=main_project_versions["libkiwix"] version=main_project_versions["libkiwix"]
), ),
"lib/{libprefix}/libkiwix.so.{version}".format( "lib/*/libkiwix.so.{version}".format(
libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
version=main_project_versions["libkiwix"][0] version=main_project_versions["libkiwix"][0]
), ),
"include/kiwix/**/*.h" "include/kiwix/**/*.h"