kiwix-build

mirror of https://github.com/kiwix/kiwix-build.git synced 2025-06-26 10:11:27 +00:00

Files

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

dependencies

Do not reset the source directory if there is modification.

2020-02-25 15:46:09 +01:00

patches

Bump-up Xapian to 1.4.14 (#382 )

2019-12-09 01:12:48 +01:00

platforms

Fix compilation of kiwix-lib-app.

2020-02-24 15:30:31 +01:00

templates

Use a specific cross_file on iOS cross compilation.