Commit graph

289 commits

Author SHA1 Message Date
Matthieu Gautier
5a84c01aa1 Revert "Use distro module to detect the distribution name."
This reverts commit 0fe69e3991.
2020-05-18 10:29:23 +02:00
Matthieu Gautier
acf62beef8 New version of libzim. 2020-05-17 18:43:58 +02:00
Matthieu Gautier
0fe69e3991 Use distro module to detect the distribution name.
`platform.linux_distribution` is deprecated.

Fix #415
2020-05-17 17:57:24 +02:00
Matthieu Gautier
46bcb17761 New version of libzim and zimwriterfs.
Only rebuild zim-tools and not all other project as the libzim release
is only about writer issues.
2020-05-11 16:38:48 +02:00
Matthieu Gautier
77b57761dc
Merge pull request #441 from kiwix/iOS_remove_32bit_builds 2020-05-11 12:02:41 +02:00
Chris Li
23a682c52d remove platform info 2020-05-09 09:11:20 -04:00
MiguelRocha
3e2df9a8e8 Added docopt cpp dependency to zimtools. It will be needed to the new version of zimdump
Do not build docopt on android and iOS.
2020-04-27 13:39:40 +02:00
Chris Li
edc606aed0 remove platform options 2020-04-24 22:20:37 -04:00
Chris Li
ddc73181db higher iOS and macOS compatibility version 2020-04-24 22:20:37 -04:00
Kelson
7f6a8856b7 Remove deprecated Mustache patch 2020-04-21 09:31:21 +02:00
Kelson
5d1f5bda1f Update to Mustache v4.1 2020-04-21 09:31:21 +02:00
Matthieu Gautier
6888794ec8 New version of kiwix-lib.
Rebuild kiwix-tools and kiwix-desktop.
2020-04-20 15:43:37 +02:00
Matthieu Gautier
99226e0c6a Build zstd in flatpak.
Revert 10c767e8ce
2020-04-20 15:14:31 +02:00
Matthieu Gautier
4b080dd975 New version of kiwix-desktop. 2020-04-20 10:10:45 +02:00
Matthieu Gautier
60e3e755e1 New build of libzim, kiwix-lib and zim-tools.
Do not build kiwix-desktop yet as we will do a new release just after.
2020-04-17 17:46:28 +02:00
Matthieu Gautier
ffdee634f4 Do not force a reconfigure of meson projects.
If meson.build changes, the ninja command will rebuild it.
And its avoid us to delete the build directory.
2020-04-10 00:38:47 +02:00
Matthieu Gautier
3d08278a85 New version of kiwix-desktop. 2020-04-08 20:42:11 +02:00
Matthieu Gautier
bd546fe33e New version of libzim, zim-tools, zimwriterfs, kiwix-lib and kiwix-tools. 2020-04-08 18:12:01 +02:00
Matthieu Gautier
10c767e8ce Do not compile zstd on flatpak.
The meson.build file of meson is not in the main directory.
We have to update kiwix-build to handle this.

For now, compile flatpak without zstd.
We will need to do a new build on flatpak with zstd soon.
2020-04-08 18:09:39 +02:00
Veloman Yunkan
25d9e18e3d Temporary fix for facebook/zstd#2073 2020-04-07 14:12:17 +04:00
Veloman Yunkan
ece4df3721 Added zstd dependency 2020-04-06 20:17:09 +02:00
Kelson
9be35a4dc0
Fix qt-everywhere-src-5.10.1.tar.xz URL (#431) 2020-04-06 20:16:01 +02:00
Matthieu Gautier
fb07b58812 Fix recompilation of the CI of meson project.
We were assuming that meson project correspond to our projects and so we
were always building them, even if they were already compiled.
(This way, a simple `kiwix-build` is enough to recompile the WIP code of
our project).

However, on the CI, we do not archive the source code/build directory in
the base deps archive. So when we try to compile, the compile step of
meson projects fails because the source are not here.
We have a small workaround for pugixml but as zstd is also meson, it is
time to do something correct.

By default, all projects now try to skip if a build is already present.
Our projects are marked as `force_build` and so, they do not try to skip.
2020-04-06 19:15:40 +02:00
Matthieu Gautier
4fa5f34125 Build all make based dependency using -O3 option.
This will build all Make, CMake, QMake dependency being build with -O3.
So all our dependencies will be build with -O3.

Our project (meson) are already build in release when needed.
kiwix-desktop should be build optimized in case of release but we need
to handle it correctly. At least not build in O3 per default as it may
break debug.
2020-03-24 16:50:38 +01:00
Matthieu Gautier
b910803fbe Use correct base version 2020-03-18 21:47:09 +01:00
Matthieu Gautier
71c46d984a Build lzma with assembler optimization. 2020-03-18 21:03:48 +01:00
Kelson
d8707d8ad1 Release kiwix-tools 3.0.3 2020-03-01 15:52:50 +01:00
Matthieu Gautier
8cecb1c759 Rebuild kiwix-lib (for android) 2020-02-26 18:32:00 +01:00
Matthieu Gautier
bf405d105c Revert 82617f6b94 2020-02-26 18:30:24 +01:00
Matthieu Gautier
6093c011ab Always write the cross_file using the same name.
Even if we use different template for different platform, we must
always use the same cross_file name.
2020-02-25 16:36:56 +01:00
Matthieu Gautier
40b5013279 Add some colors in the terminal. 2020-02-25 15:48:20 +01:00
Matthieu Gautier
f504cf54e1 Do not reset the source directory if there is modification.
We simply do a `git merge --ff-only` instead of a `git reset`. This way:

- No change on the local repository
    => update to `remote/master`
- If you switch branch and local branch is behind `remote/master`
    => fast forward to `remote/master`
- If you switch branch and branches diverge
    => No update of the directory
- On branch master (or a branch behind `origin/master`) with compatible
  change in the working tree.
    =>  update of the directory
- On branch master (or a branch behind `origin/master`) but incompatible
  change in the working tree.
    =>  No update.

This way, sources are keep up-to-date as far as possible.
2020-02-25 15:46:09 +01:00
Matthieu Gautier
94c98261c7 Fix compilation on different platform in the same time.
If we modify the dependency's configure_env, we may change
the dictionary with value of the first platform. Then, when
we use it for the second platform, the previous values are used.

Do not modify the dep_conf_env dictionary and then we are good.
2020-02-24 18:24:07 +01:00
Matthieu Gautier
32e3b5b5c4 Fix compilation of kiwix-lib-app.
- We should not try to set the cross compilation flags when we use
  gradle.
- Fix anyway the setting of tho cross compilation flags for android sdk
  platform (the default implementation use the `static` attributes that
  doesn't exist for android)
2020-02-24 15:30:31 +01:00
Matthieu Gautier
661eb95df0 Use a specific cross_file on iOS cross compilation.
We need to set the property `needs_exe_wrapper` to true for
x86_64 cross compilation.

Else, meson will try to detect if we could run the cross
compiled executable, and because it is the same arch, it will
assume we can. So it will try to sanity check and execute the
cross compiled binary. Then fails.
2020-02-21 16:29:23 +01:00
Matthieu Gautier
7b6c79482a Make the dependency responsible to set the compilation env.
Instead of having the run_command function setting the
env from the buildEnv, this is the dependency that create the
env and then pass it to the run_command function.

This way, each dependency will be able to set a specific env.
2020-02-21 16:29:23 +01:00
Matthieu Gautier
e27ede80cc Use correct arch_full name. 2020-02-21 15:12:17 +01:00
Matthieu Gautier
36366b2dd3 Better define of value in ios platform.
No real change, just better code to define it.
2020-02-21 15:12:17 +01:00
Matthieu Gautier
7d742f807f Fix setting of environment using env from dependency.
If `self.configure_env` is a (computed) property, the previous code
never format the value of the env.
2020-02-21 15:12:17 +01:00
Matthieu Gautier
c4295b1644 Do not set a specific compiler for ios 2020-02-21 15:12:17 +01:00
Matthieu Gautier
79bb23504b Update version of kiwix-lib to 9.0.1
Do not rebuild dependencies as the change is only about the android
wrapper.
2020-02-21 15:00:26 +01:00
Matthieu Gautier
14d6aae4b1 Update version of kiwix-tools. 2020-02-13 11:46:20 +01:00
Matthieu Gautier
5d9730423a Update version of kiwix-lib.
Do not make a new build of kiwix-tools right now as we will do a
new release of it once kiwix-lib release is published.
2020-02-12 15:27:27 +01:00
renaud gaudin
3569c277a9 switch to older version of libmicrohttpd
libmicrohttpd 0.9.69 is not working properly on macOS (catalina)
2020-02-12 11:09:46 +01:00
renaud gaudin
5af0a8bfe7 fixed crash in xapian-core configure
use a copy of configure_env to prevent edits on what's being iterated
2020-02-11 13:10:21 +00:00
Kelson
29956ee6be Release zimwriterfs 1.3.8 2020-02-10 14:36:11 +01:00
Matthieu Gautier
0a37c8a573 Change args given to kiwix-lib meson for android. 2020-01-28 15:49:52 +01:00
Matthieu Gautier
2774967e6d Set the pkg-config for cross-compiling.
This is needed for win32 on fedora.
It is better to use a specific pkg-config than setting a PKG_CONFIG_LIBDIR.
This avoid other CI (libzim/...) to set a env var specific to win32 build.
2020-01-20 22:55:50 +01:00
Matthieu Gautier
82617f6b94 Do not set march for android build.
We already build to the right architecture by using the arch_full triplet
gcc/g++/...
We don't need to set march when building android.
2020-01-20 22:55:21 +01:00
Kelson
b92a111fcc
Upgrade libmicrohttpd to 0.9.69 (#394) 2019-12-16 16:57:59 +01:00