With the commit fb07b58 we are not skiping the compile/build process
of meson project. As meson projects first remove the build directory
before configuring, we remove dist archives that could have been generated
before.
Copy the dist archive in the export so we are ok.
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.
Failing to do so in PR#384 secretly broke the appveyor build (no real
failures were observed since the appveyor builds ran in USE_CACHE=1
mode, without rebuilding the base dependencies to which xapian belongs).
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.
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.
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.
