From 1c6994546cb2c272d913f8943a92f9162cd1f661 Mon Sep 17 00:00:00 2001 From: Veloman Yunkan Date: Fri, 22 Nov 2024 17:41:50 +0400 Subject: [PATCH] Under Windows builds are forced to release mode base_deps_meta_version was bumped so that the base dependencies archives for CI workflows are recreated (we need only the Windows flavours of the archives updated but such surgical intervention is not supported). --- kiwixbuild/dependencies/base.py | 3 +++ kiwixbuild/dependencies/kiwix_desktop.py | 4 ++-- kiwixbuild/versions.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py index de9c98e4..45d0422a 100644 --- a/kiwixbuild/dependencies/base.py +++ b/kiwixbuild/dependencies/base.py @@ -538,6 +538,9 @@ class MesonBuilder(Builder): @property def build_type(self): + if platform.system() == "Windows": + return "release" + return "release" if option("make_release") else "debug" @property diff --git a/kiwixbuild/dependencies/kiwix_desktop.py b/kiwixbuild/dependencies/kiwix_desktop.py index 702fdbd0..a9e536cc 100644 --- a/kiwixbuild/dependencies/kiwix_desktop.py +++ b/kiwixbuild/dependencies/kiwix_desktop.py @@ -20,14 +20,14 @@ class Builder(QMakeBuilder): @property def make_targets(self): if platform.system() == "Windows": - yield "release-all" if option("make_release") else "debug-all" + yield "release-all" else: yield from super().make_targets @property def make_install_targets(self): if platform.system() == "Windows": - yield "release-install" if option("make_release") else "debug-install" + yield "release-install" else: yield "install" diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index bffcec1a..818ea206 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -33,7 +33,7 @@ # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = "09" +base_deps_meta_version = "10" base_deps_versions = { "zlib": "1.2.12",