diff --git a/.github/scripts/common.py b/.github/scripts/common.py index f483291..0aa2429 100644 --- a/.github/scripts/common.py +++ b/.github/scripts/common.py @@ -64,6 +64,9 @@ FLATPAK_GIT_REMOTE = "git@github.com:flathub/org.kiwix.desktop.git" BIN_EXT = ".exe" if PLATFORM_TARGET.startswith("win32_") else "" +def major_version(version: str) -> str: + return version.split(".")[0] + # We have build everything. Now create archives for public deployement. EXPORT_FILES = { "kiwix-tools": ( @@ -100,12 +103,13 @@ EXPORT_FILES = { version=main_project_versions["libzim"] ), "lib/*/libzim.so.{version}".format( - version=main_project_versions["libzim"][0] + version=major_version(main_project_versions["libzim"]) ), "lib/libzim.{}.dylib".format( - main_project_versions["libzim"][0] + major_version(main_project_versions["libzim"]) ), "lib/libzim.dylib", + "lib/*/libzim.pc", "include/zim/**/*.h", ), ), @@ -117,8 +121,13 @@ EXPORT_FILES = { version=main_project_versions["libkiwix"] ), "lib/*/libkiwix.so.{version}".format( - version=main_project_versions["libkiwix"][0] + version=major_version(main_project_versions["libkiwix"]) ), + "lib/libkiwix.{}.dylib".format( + major_version(main_project_versions["libkiwix"]) + ), + "lib/libkiwix.dylib", + "lib/*/libkiwix.pc", "include/kiwix/**/*.h" ), ), @@ -126,7 +135,6 @@ EXPORT_FILES = { DATE = date.today().isoformat() - def print_message(message, *args, **kwargs): message = message.format(*args, **kwargs) message = "{0} {1} {0}".format("-" * 3, message)