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 #744 from kiwix/naming_fixes

This commit is contained in:
Matthieu Gautier 2024-08-30 15:01:47 +02:00 committed by GitHub
parent 5f65164e1a d091c8802f
commit b527c7c0bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,10 @@ default_tmp_dir = os.getenv("TEMP") if platform.system() == "Windows" else "/tmp
TMP_DIR = Path(os.getenv("TMP_DIR", default_tmp_dir)) TMP_DIR = Path(os.getenv("TMP_DIR", default_tmp_dir))
if platform.system() == "Windows": if platform.system() == "Windows":
KBUILD_SOURCE_DIR = Path(_environ["GITHUB_WORKSPACE"]) KBUILD_SOURCE_DIR = Path(_environ["GITHUB_WORKSPACE"])
BIN_EXT = ".exe"
else: else:
KBUILD_SOURCE_DIR = HOME / "kiwix-build" KBUILD_SOURCE_DIR = HOME / "kiwix-build"
BIN_EXT = ".exe" if COMPILE_CONFIG.startswith("win32_") else ""
_ref = _environ.get("GITHUB_REF", "").split("/")[-1] _ref = _environ.get("GITHUB_REF", "").split("/")[-1]
@ -62,8 +64,6 @@ else:
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"
BIN_EXT = ".exe" if COMPILE_CONFIG.startswith("win32_") else ""
def major_version(version: str) -> str: def major_version(version: str) -> str:
return version.split(".")[0] return version.split(".")[0]
@ -137,7 +137,14 @@ EXPORT_FILES = {
"lib/libkiwix.{}.dylib".format( "lib/libkiwix.{}.dylib".format(
major_version(main_project_versions["libkiwix"]) major_version(main_project_versions["libkiwix"])
), ),
"bin/kiwix-{version}.dll".format(
version=major_version(main_project_versions["libkiwix"])
),
"bin/icu*.dll", "bin/icu*.dll",
"bin/kiwix-{version}.pdb".format(
version=major_version(main_project_versions["libkiwix"])
),
"lib/kiwix.lib",
"lib/libkiwix.dylib", "lib/libkiwix.dylib",
"lib/*/libkiwix.pc", "lib/*/libkiwix.pc",
"include/kiwix/**/*.h", "include/kiwix/**/*.h",
@ -489,7 +496,7 @@ def create_desktop_image(make_release):
app_name = "org.kiwix.desktop.{}.flatpak".format(postfix) app_name = "org.kiwix.desktop.{}.flatpak".format(postfix)
print_message("archive is {}", build_path) print_message("archive is {}", build_path)
elif platform.system() == "Windows": elif platform.system() == "Windows":
archive_basename = "Kiwix-{}-win-amd64".format(postfix) archive_basename = "kiwix-desktop_windows_x64_{}".format(postfix)
working_dir = INSTALL_DIR / archive_basename working_dir = INSTALL_DIR / archive_basename
build_path = working_dir.with_suffix(".zip") build_path = working_dir.with_suffix(".zip")
app_name = build_path.name app_name = build_path.name