Skip to content

Commit

Permalink
Merge pull request #525 from kiwix/version_3.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mgautierfr committed Jan 20, 2022
2 parents 04ac155 + 6dfdcea commit ea44dc7
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 15 deletions.
23 changes: 23 additions & 0 deletions Changelog
@@ -1,3 +1,26 @@
kiwix-tools 3.2.0
=================

* Print the version of all dependencies (@kelson42 #516)
* Better Docker images (@kelson42 @rgaudin)
* Update Readme (@kelson42)
* Build debian packages on CI (@legoktm #394)
* Add man pages for kiwix-read and kiwix-search (@legoktm #392)
* Various fixes (@legoktm @hashworks @mgautierfr)


kiwix-serve
-----------

* Print the url on which a user can connect to on startup (@nikhil #499 #522)
* Reload library on SIGHUP signal (@veloman-yunkan #497)
* Add a option `--monitorLibrary` to monitor and automically reload the library
(@veloman-yunkan #503)
* Correct handling of SIGTERM and SIGINT (@veloman-yunkan #488)
* Add `--customIndexTemplate` option (@manan #477)
* Add `--help` option (@kelson42 #511)


kiwix-tools 3.1.2
=================

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -41,8 +41,8 @@ Dependencies
The Kiwix tools rely on a few third party software libraries. They are
prerequisites to the Kiwix tools compilation. Therefore, following
libraries need to be available:
* [Libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
* [Zlib](https://www.zlib.net/) (package `zlib1g-dev` on Debian/Ubuntu)
* [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
* [libzim](https://github.com/openzim/libzim) (package `libzim` on Debian/Ubuntu)

These dependencies may or may not be packaged by your operating
system. They may also be packaged but only in an older version. They
Expand Down
5 changes: 2 additions & 3 deletions debian/control
Expand Up @@ -3,11 +3,10 @@ Section: utils
Priority: optional
Maintainer: Kiwix team <kiwix@kiwix.org>
Build-Depends: debhelper-compat (= 13),
libkiwix-dev (>= 9.3.0~),
libmicrohttpd-dev,
libkiwix-dev (>= 10.0.0),
libzim-dev (>= 7.2.0),
meson,
pkg-config,
zlib1g-dev
Standards-Version: 4.5.0
Homepage: https://github.com/kiwix/kiwix-tools
Rules-Requires-Root: no
Expand Down
14 changes: 4 additions & 10 deletions meson.build
@@ -1,5 +1,5 @@
project('kiwix-tools', 'cpp',
version : '3.1.2',
version : '3.2.0',
license : 'GPL',
default_options: ['c_std=c11', 'cpp_std=c++11'])

Expand All @@ -12,17 +12,11 @@ if static_linkage
add_global_link_arguments('-static-libstdc++', '--static', language:'cpp')
endif

libzim_dep = dependency('libzim', version : '>=7.2.0', static:static_linkage)
if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
endif

thread_dep = dependency('threads')
libkiwix_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage)
microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
z_dep = dependency('zlib', static:static_linkage)
kiwixlib_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage)
libzim_dep = dependency('libzim', version:'>=7.2.0', static:static_linkage)

all_deps = [thread_dep, libzim_dep, libkiwix_dep, microhttpd_dep, z_dep]
all_deps = [thread_dep, kiwixlib_dep, libzim_dep]

if static_linkage
librt = compiler.find_library('rt', required:false)
Expand Down

0 comments on commit ea44dc7

Please sign in to comment.