Commit Graph

1619 Commits

Author SHA1 Message Date
04d0ba6a92 Temporary deactivate test for libkiwix on Windows. 2024-08-21 13:33:26 +02:00
dba6065457 Build dependencies of other projects on Windows 2024-08-21 13:33:26 +02:00
e0ffa7bdc2 [CI] Correctly include dll and lib in libzim archive 2024-08-21 11:02:36 +02:00
b027e1b78c Merge pull request #724 from kiwix/fix_icu4c_meson_patch 2024-08-21 11:02:24 +02:00
294c34ca80 Fix extract of meson archive.
Previous commit was removing the meson_archive.

Fix #723
2024-08-21 10:02:33 +02:00
2a9d545576 Merge pull request #722 from kiwix/fix_pkg_config_icu4c
Fix pkg_config template for icu4c on Windows.
2024-08-20 18:51:24 +02:00
edf1e4ce03 Fix pkg_config template for icu4c on Windows.
We must use `/` separator.
Meson post-process output of pkg-config. If we use `\`,  it miss-interpret it
and libdir is broken.
2024-08-20 18:15:24 +02:00
3bd6ba5ec7 Merge pull request #721 from kiwix/ci_windows_all_config 2024-08-20 17:37:15 +02:00
00363fdc8c Use prebuilt icu on Windows 2024-08-20 17:07:45 +02:00
97d446642c [CI] Run native windows CI on release/Nigthly 2024-08-20 09:56:22 +02:00
51cceb7c58 [CI] Run the Windows CI using all native config (static, dyn, mixed) 2024-08-20 09:53:52 +02:00
b2704f66f8 Merge pull request #720 from kiwix/no_qt_compile 2024-08-19 13:50:42 +02:00
f433b25013 Kiwix-build doesn't try to build qt nor qtwebengine
Fix #714
2024-08-19 12:11:38 +02:00
c917ff08c3 Merge pull request #718 from kiwix/fix_dl_deps_archive 2024-08-19 11:53:47 +02:00
cf60d1789d Update dl_deps_archive dist 2024-08-19 11:37:44 +02:00
ad72464794 Merge pull request #715 from kiwix/win-xapian 2024-08-18 12:10:18 +02:00
be232d790e Add xapian-core to base dependencies on Windows. 2024-08-15 14:10:17 +02:00
28d02bfd7a Deactivate xapian fuller compact on libzim.
This flag used on xapian-meson build on Windows ends in a crash in
libzim when compacting the database.

To be fixed at a moment but let's not use this flag for now on Windows
2024-08-15 14:09:15 +02:00
752bdd18ac Build xapian with classic autotools on other platform than Windows.
The meson build fails on cross compiliation `win32_*` and
on `native_dyn` on Macos (but doesn't fail on `native_static` or
`native_mixed`...)

On top of that, the fact that xapian-meson build system is fluky on
Windows doesn't make me confident.
As I will be out for few months, I prefer keep the autotool build system
on already working configs.
2024-08-15 14:07:24 +02:00
16654f9563 All native config are compatible with windows. 2024-08-15 14:07:16 +02:00
ef6f654e7b Build native_mixed on windows
Xapian build with meson is static only.
This is mainly due to missing "ddl export" or ".def" file.

Autotool buildsystem seems to handle that automatically but not meson.
See https://github.com/mesonbuild/meson/issues/2132 about meson
supporting this.
2024-08-15 14:04:32 +02:00
b026e7e06c Bump base_deps_meta_version to rebuild xapian-core 2024-08-15 14:04:26 +02:00
942dba4d9c Use git source for xapian.
We have move the meson build system (and various fixes) in a git
repository.
2024-08-15 14:03:59 +02:00
b589496076 Do not use custom data for icu4c on Windows.
Meson build system of ICU seems to not support custom data on Windows.
So let's use the default data on Windows.
2024-08-15 14:03:55 +02:00
f9b890c58d Build xapian using meson build system. 2024-08-15 14:03:49 +02:00
8648e8bc27 Revert "Do not build libzim with xapian dependency on Windows."
This reverts commit 6bfe9ec8b1.
2024-08-15 14:03:45 +02:00
9931bb690a Merge pull request #717 from kiwix/update_flatpak
Update flatpak build
2024-08-14 21:50:32 +02:00
907d39ab84 Update flatpak build
Fix https://github.com/flathub/org.kiwix.desktop/issues/10
Fix https://github.com/kiwix/kiwix-desktop/issues/961
2024-08-14 17:12:41 +02:00
08efe8e1f7 Merge pull request #716 from kiwix/gz_dep_archive 2024-08-14 17:12:29 +02:00
5248b4eb2a Use gz compression for deps archive.
It is a bit of memory waste but a lot of time win (at least
on android build)
2024-08-14 15:02:57 +02:00
6463307ac7 Merge pull request #711 from kiwix/zim-tools_3.4.2 r_65 2024-07-11 09:48:17 +02:00
2a1b18066f New version 3.4.2 of zim-tools 2024-07-10 19:12:25 +02:00
02b0ae677c Merge pull request #710 from kiwix/no_qmake5_hardcoded 2024-07-10 19:12:09 +02:00
c7bd6182e0 Do not hard-code qmake command 2024-07-08 15:25:54 +02:00
cba77fdca6 Merge pull request #709 from kiwix/rebuild_libkiwix r_64 2024-06-28 10:41:54 +02:00
d066655a73 Rebuild libkiwix 13.1.0
When releasing libzim and libkiwix, we use config native_mixed with is a
mix of static and dynamic linking:

- Dependencies are build as static libraries.
- Released projects (libzim/libkiwix) are build as dynamic libraries,
  statically linked to dependencies.

This way, we have only one `.so` file which contain all our needed symbols.

However, this logic is "local" to each project.
This mean that libkiwix is linked **statically** to libzim.
So libkiwix.so is containing libzim symbols.

But on "java-libkiwix", we are both linking to libzim.so and libkiwix.so.
If the version of the (dynamically) used libzim.so is not the same that the
version on which we have (statically) linked libkiwix.so, we end with
symbols of two different versions being loaded and conflicting.

So let's rebuild libkiwix with last version of libzim to avoid this conflict.
2024-06-28 09:50:52 +02:00
289ae6f78a Merge pull request #708 from kiwix/libzim_9.2.2
Release libzim 9.2.2
r_63
2024-06-22 15:52:19 +02:00
35ca7068a1 Bump-up version of base_deps_meta_version 2024-06-22 15:00:08 +02:00
4b6c4a2547 Use version 0.6.0 of ZIM testing suite 2024-06-22 14:55:32 +02:00
2b25f3cfc3 Release libzim 9.2.2 2024-06-22 14:24:20 +02:00
23de94e0ca Merge pull request #707 from kiwix/fix_appveyor_build 2024-06-20 17:49:41 +02:00
2652899781 [AppVeyor] Update url of pkg-config-lite 2024-06-20 17:24:38 +02:00
e31147c7e5 Revert "WIP Use windows branch on windows CI"
This reverts commit 05fc3b409c.

This was a temporary commit to make the PR compile with a dev branch of libzim.
Now PR on libzim is merged. We must remove this commit.
2024-06-17 10:11:03 +02:00
e408b5b1ca Merge pull request #703 from kiwix/libzim_github_ci_windows
Libzim GitHub CI windows
2024-06-15 16:43:10 +02:00
05fc3b409c WIP Use windows branch on windows CI 2024-06-07 18:34:30 +02:00
d2d1f686b1 Build libzim on windows with werror=false
MSVC throw a lot of warning because we also must re-export stl symbols
used in our exported class.

See [1] and [2] (and links inside) for more information.

Especially [3] which seems to say that we should have issue at link time if
it compatibility issue occurs (and so easily catchable).

So I just remove the `werror=true` for now.

[1] https://stackoverflow.com/questions/16419318/one-way-of-eliminating-c4251-warning-when-using-stl-classes-in-the-dll-interface
[2] https://stackoverflow.com/questions/2132747/warning-c4251-when-building-a-dll-that-exports-a-class-containing-an-atlcstrin
2024-06-07 18:33:55 +02:00
703554d556 Correctly strip newline (on Windows) 2024-06-07 15:38:46 +02:00
46e58b763d Don't depend on lzma. 2024-06-07 15:38:45 +02:00
6bfe9ec8b1 Do not build libzim with xapian dependency on Windows. 2024-06-07 15:38:05 +02:00
e3656ab3f6 Do not print warning on windows 2024-06-07 15:36:58 +02:00