Commit Graph

104 Commits

Author SHA1 Message Date
Matthieu Gautier 39a93b07b3 Fix dependency detection for zim-tools. 2020-07-15 15:51:09 +02:00
Alexander Sashnov da31dd428e remove 'zimwriterfs' project from build and CI configuration
'zimwriterfs' is now a part of zim-tools (openzim/zim-tools/#92)
2020-07-08 16:54:14 +02:00
Kelson 3de886f805 Upgrade libmicrohttpd to 0.9.71 2020-07-08 14:57:38 +02:00
MiguelRocha e72589a850 Added a flag to force kiwix build to not do fast_clone
- Docopt cannot do fast_clone cause it is getting a
    specific commit id. This will be changed when a new
    release is available.
2020-05-25 10:57:22 +02:00
MiguelRocha 69c33da0bc Now kiwix-build retrives docopt from a commit that has pkgconfig support. 2020-05-25 10:57:04 +02: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
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 99226e0c6a Build zstd in flatpak.
Revert 10c767e8ce
2020-04-20 15:14:31 +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
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 71c46d984a Build lzma with assembler optimization. 2020-03-18 21:03:48 +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 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 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
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
Matthieu Gautier 0a37c8a573 Change args given to kiwix-lib meson for android. 2020-01-28 15:49:52 +01:00
Kelson b92a111fcc
Upgrade libmicrohttpd to 0.9.69 (#394) 2019-12-16 16:57:59 +01:00
Kelson 8420dcb474 Bump-up Xapian to 1.4.14 (#382) 2019-12-09 01:12:48 +01:00
Matthieu Gautier a82d6430dc Remove support of kiwix-android and kiwix-custom-app. 2019-12-05 12:30:10 +01:00
Matthieu Gautier b6bbf9b098 Do not install gradle. Use gradlew script. 2019-12-05 12:30:10 +01:00
Kelson e602897e6b
Newest version of libcurl (#387) 2019-12-05 06:29:00 -05:00
Kelson 0085a5c565 Revert "Bump-up Xapian to 1.4.14 (#382)"
This reverts commit f4f9f6f833.
2019-11-25 03:34:41 +01:00
Kelson f4f9f6f833
Bump-up Xapian to 1.4.14 (#382) 2019-11-24 07:37:39 -05:00
Kelson 6b43f5ad48
Update libmicrohttpd to 0.9.66 (#365)
* Update libmicrohttpd to 0.9.66

* Proper Bash syntax highlighting
2019-09-06 15:54:44 +02:00
Matthieu Gautier f2369c6819 Build project in debug by default instead of debugoptimized. 2019-09-04 17:10:44 +02:00
Matthieu Gautier 2e347b2b33 Do not generate the pom file in kiwix-build.
Now we generate the pom file in kiwix-lib side, we don't need to generate
it ourselves.
2019-08-21 14:27:24 +02:00
Matthieu Gautier f80afdecbc Move to last version of libmicrohttpd.
Again.. 0dcaa28 move back to a previous version (probably a wrong rebase)
2019-08-19 18:42:01 +02:00
Matthieu Gautier bd43b9cb10 Do not download gtest in flatpak. 2019-08-19 17:02:44 +02:00
Matthieu Gautier 0dcaa28e35 libmicrohttpd is now a dependency of kiwix-lib, not kiwix-tools.
And we have to install libmicrohttpd on windows.
2019-08-10 19:44:10 +02:00
Matthieu Gautier 07f8150eb6 Use the name "kiwix-lib" for the source of "kiwix-lib-app". 2019-08-01 14:57:06 +02:00
Matthieu Gautier 7c2527c38f Do not try to download subproject for libzim in flatpak. 2019-07-31 16:36:31 +02:00
Matthieu Gautier 7d659baa37 Package kiwix-serve within kiwix-desktop.
Now that kiwix-desktop use kiwix-serve to serve the content, we need to
compile and package kiwix-serve (kiwix-tools).
2019-07-24 11:17:39 +02:00
Matthieu Gautier 9bbc3930ae Print the duration of each steps. 2019-07-24 10:25:52 +02:00
Matthieu Gautier 3a1cd6ddb2 Build the kiwix-lib android "application" in kiwix-build.
This is not a real application as it is dependency for kiwix-android.
But it a app in the sens that it is packaged for android build system.
2019-07-24 10:25:52 +02:00
Kelson 4c342c5b9d
Update libmicrohttpd to 0.9.65 (#347) 2019-07-23 14:55:34 +02:00
Matthieu Gautier ef9755eff5 Remove android mips platforms
Also correctly rename Android classes.
2019-06-14 14:13:18 +02:00
Isaac Hutt 06da96f85f Update gradle to 5.2 2019-06-03 06:26:28 +02:00
Kelson 456537e188 Disable Xapian remote backend 2019-06-02 17:15:26 +02:00
Matthieu Gautier f9d5e0aa21 Use an already made archive for the armhf toolchains instead of git clone.
First, we don't need to clone all the git repository, we only need a
sub-directory.
Secondly, as we the base_deps archives only archive the sub-directory,
subsequent run of kiwix-build in the ci will try to do a git update on
a non git repository.

By making ourselves a tar archive, we simplify the process.

The archive on download.kiwix.org has been made with :
`tar czf raspberrypy-tools.tar.gz raspberrypi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64`
`raspberrypi-tools` being a clone of `https://github.com/raspberrypi/tools`
commit sha is 5caa7046982f0539cf5380f94da04b31129ed521
2019-05-02 17:43:11 +02:00
Matthieu Gautier 318c524f4c Use our own server to store libmagic. 2019-04-30 15:28:21 +02:00
Matthieu Gautier 2970a2d445 Update to new version of lzma and get it from kiwix.org server.
It seems that the downloading of the archive stored on sourceforge
fails sometime.

Use the archive stored in our server (download.kiwix.org) instead.
And also move to the last version of lzma.
2019-03-06 10:24:09 +01:00