smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,597 Commits 23 Branches 58 Tags 88 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
Matthieu Gautier 92c9a47a0d Move the templating system to mustache instead of ctpp2. 
Mustache templating system is a bit simpler than ctpp2 and ctpp2 is no
more maintained (see #189).
We are moving to the kainjow's Mustache project
(https://github.com/kainjow/Mustache).

It simplify a lot our system has it is header only and we don't have to
precompile the template.

Fix #21
 2019-01-09 18:28:48 +01:00
Matthieu Gautier 5159d985c6 Remove support for external index. 
This feature is considered obsolete for a while.
In fact, it was already not supported since June 2018 as we were compiling
xapian without the chert backend support.

Assume that we don't support it and remove it from the code.
See kiwix/kiwix-tools#245

This is a API break. library.xml files will still work but the indexPath
and indexType will be dropped silently from the file.
 2019-01-07 16:47:08 +01:00
Matthieu Gautier 49a606a043 new version 3.1.1 2018-12-13 17:29:21 +01:00
Matthieu Gautier cf28af4439 new version 3.1.0 2018-12-02 15:56:00 +01:00
Matthieu Gautier 2821b9e06a New version 3.0.3 2018-11-12 16:48:35 +01:00
Matthieu Gautier 57d3552b97 New version 3.0.2 2018-11-03 12:20:13 +01:00
Matthieu Gautier 4d904c4d8b New version 3.0.1 2018-11-02 17:10:05 +01:00
Matthieu Gautier a60ffe78d5 New version 3.0.0 2018-10-31 14:35:22 +01:00
Matthieu Gautier 5ed095531e Correctly set pkgconfig file for static curl linking. 2018-10-30 12:59:30 +01:00
Matthieu Gautier 910ce5f10d Fix for Windows 
- "winsock2.h" needs to be included before "windows.h". But if a
  compilation unit include "windows.h" and after "networkTools.h", we
  fails and it is complicated to handle. The include must not be in the
  header but in the cpp
- windows define some ERROR macro. It is a pitty but we cannot use `ERROR`
  in our enum.
- If build statically using mingw we need to define `CURL_STATICLIB`
 2018-10-24 10:47:12 +02:00
Matthieu Gautier db9000f706 Make the downloader use the aria2c wrapper instead of the aria2 library. 2018-09-06 18:30:34 +02:00
Matthieu Gautier 0a93cb0872 Add aria2 downloader using subprocess aria2c. 2018-09-06 18:29:49 +02:00
Matthieu Gautier 790fa99143 New version 2.0.2 2018-08-03 19:37:21 +02:00
Matthieu Gautier bf2188af14 [Windows] Add extra link arguments to build test on windows. 2018-08-03 19:22:39 +02:00
Matthieu Gautier 3cf58b5f5b Make libaria2 an optional dependency. 
We don't compile libaria2 on Windows.
 2018-08-03 19:22:39 +02:00
Kelson 620f1b5e13 Use -llog only for Android 2018-07-07 20:19:34 +02:00
Isaac Hutt 76ca4b0cee
Add -llog 2018-06-29 16:57:32 +02:00
Matthieu Gautier 2a03147662 New version 2.0.1 2018-06-15 18:07:51 +02:00
Matthieu Gautier 433a47c3fe Add unittest structure. 
No tests, just everything to add tests later.
 2018-05-14 17:40:43 +02:00
Matthieu Gautier 45a000edaa New version 2.0.0 2018-04-23 18:06:49 +02:00
Matthieu Gautier e216c44034 kiwix-lib needs libzim>=3.3.0 2018-04-23 18:06:49 +02:00
Matthieu Gautier 1f091da3f4 Add a downloader tools to download files. 
The downloader is using libaria2.

For now, only one download can be run a the time.
A download will start only if (and as soon as) no download is running.
 2018-04-19 17:53:08 +02:00
Matthieu Gautier ec097ab267 Try to compile kiwix-lib without warning. 2018-04-18 16:57:27 +02:00
Matthieu Gautier a216ad5a6f Find ctpp2 lib in the normal lib dir and fallback to 'lib'. 
ctpp2 libs should be in the "normal" lib dir, so search in it.
The 'lib' dir should only be used as a fallback.
 2018-04-17 14:37:19 +02:00
Matthieu Gautier f2413f6680 New version 1.1.1 2018-03-27 17:22:38 +02:00
Matthieu Gautier a55824acc7 New version 1.1.0. 2018-03-27 11:05:02 +02:00
Matthieu Gautier d4f0344d9d Fix version in pkg_config. 2017-10-23 15:20:56 +02:00
Matthieu Gautier 3134ab6b56 New release 1.0.0 2017-10-20 15:19:59 +02:00
Matthieu Gautier 25a05cc64a Build with static dependencies when building for android or static. 2017-10-10 10:48:48 +02:00
Matthieu Gautier 96f199a327 Dump the version to 0.2.0 
Time to make a release.
 2017-06-27 14:26:13 +02:00
Matthieu Gautier c44b2acb56 Re-add xapian searcher in kiwix-lib. 
libzim only know how to read embedded full text index in a zim file.
This is nice as we want to embedded the full text index in zim file and
not have separated full text index.

However, we still have some zim+separated index we have to read.
So we have to support the search in separated index for a while.
 2017-05-24 16:08:00 +02:00
Kelson 9963c73150 Meson 'ctpp2_include_path' has to be declared 2017-05-16 16:23:50 +02:00
Matthieu Gautier 9abdc6ce02 Move to c++11. 
Zimlib move to c++11 and so, we need a c++11 compiler.
 2017-04-10 14:28:25 +02:00
Matthieu Gautier 5ca419bee7 Use the new search API in zimlib. 
We do not use xapian anymore. This is all handled by zimlib.
 2017-04-10 14:28:25 +02:00
Matthieu Gautier 72a6b578e6 Fix meson's project version. 2017-03-21 16:01:07 +01:00
Matthieu Gautier 9616530648 Correctly discover if we have libiconv and use it if necessary. 2017-02-22 12:06:31 +01:00
Matthieu Gautier 84796abb4c Make use of ctpp2 optional. 2017-02-22 12:05:44 +01:00
Matthieu Gautier 7b76d432a7 Do not link with iconv when cross-compilating to windows. 
Ideally we should check if iconv is present to know if ctpp2 has been
build with iconv.
This may be a bit too complex for our present case. As we know our
cross-compilation environment. It is better to remove the use of iconv
everywhere for now.
 2017-02-07 12:24:13 +01:00
Matthieu Gautier 50071d1053 Do not try to link with ctpp2-st. 
ctpp2-st is not a standard name, all other projects use the same base name
for dynamic and static libs.

Debian already patch the lib name in the ctpp2 package.
As we also patch it in kiwix-build, we can ignore ctpp2-st and always
try to link on ctpp2.

This is even necessary if we use the ctpp2-install-prefix. As we ctpp2 is
in a custom directory, meson fails in the foreach loop as it cannot find
ctpp2.
We could fix, the ctpp2 lib search to also search ctpp2-st in standard
directory AND the custom one but it seems to be a lot of work for nothing
as ctpp2-st is not used at all in our usecases.
 2017-01-30 17:58:29 +01:00
Emmanuel Engelhart 7a03cb7712 Better (static) ctpp2 lib detection #14 2017-01-27 22:15:09 +01:00
Matthieu Gautier 5a9fd265d3 Correctly compare version of meson 2017-01-24 11:59:15 +01:00
Matthieu Gautier 317b13b56b Use old find_library to found ctpp2 lib if meson version < 0.31.0. 
We need to support as far as possible the meson version installed on
ubuntu 16.04 (LTS).

In meson 0.31.0, the find_library has moved as a method of the compiler.

Fix #10
 2017-01-17 17:34:32 +01:00
Matthieu Gautier 88f6b3a0f9 On Windows, ctpp2 use the iconv libraries. 
If we are cross-compiling to windows, we need to also link with the
iconv library.

We do not check for the iconv library existance here. We assume that
if the ctpp2 library is present all its own dependencies are present also.
 2017-01-17 17:33:35 +01:00
Matthieu Gautier 12f148974f Remove the need of the aria2c dependency. 
Aria2c is not use at all in kiwix-lib.

Fix #13
 2017-01-17 15:56:02 +01:00
Kunal Mehta baf4c9050f meson: Use 'libzim' name as a dependency 
With <https://gerrit.wikimedia.org/r/#/c/329759/>, the library is now
registered with pkg-config as "libzim".
 2016-12-31 23:49:42 -08:00
Matthieu Gautier cba71b4e75 Add a new script to compile resources. 
- No more dependency to reswrap binary (everything is done in python)
- Resource strings can be directly accessed.
  As side effect, it add a check at compilation if the resource is
  declared and compiled in the binary.
- The resource content can be overwritten at runtime with a env variable.

There is also few clean in the static as some files shoul be in the tools
directory.

The compile_resource script is install to let other project use it.
 2016-12-23 13:06:12 +01:00
Matthieu Gautier 8b34414458 There is no need for zlib/bzip/lzma dependencies. 
They are provided by libzim.
 2016-12-22 12:01:20 +01:00
Matthieu Gautier 8ce1fb0ba8 Switch build system to mesonbuild. 
There is no more integrated build of dependencies in the build system.
Dependencies are discovered using pkg-config except for ctpp2 where there
is no pkg-config file.
 2016-12-22 12:01:20 +01:00