mirror of
https://github.com/kiwix/kiwix-tools.git
synced 2025-09-23 03:52:35 -04:00
Merge pull request #525 from kiwix/version_3.2.0
This commit is contained in:
commit
ea44dc76f6
23
Changelog
23
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
|
kiwix-tools 3.1.2
|
||||||
=================
|
=================
|
||||||
|
|
||||||
|
@ -41,8 +41,8 @@ Dependencies
|
|||||||
The Kiwix tools rely on a few third party software libraries. They are
|
The Kiwix tools rely on a few third party software libraries. They are
|
||||||
prerequisites to the Kiwix tools compilation. Therefore, following
|
prerequisites to the Kiwix tools compilation. Therefore, following
|
||||||
libraries need to be available:
|
libraries need to be available:
|
||||||
* [Libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
|
* [libkiwix](https://github.com/kiwix/libkiwix) (package `libkiwix` on Debian/Ubuntu)
|
||||||
* [Zlib](https://www.zlib.net/) (package `zlib1g-dev` 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
|
These dependencies may or may not be packaged by your operating
|
||||||
system. They may also be packaged but only in an older version. They
|
system. They may also be packaged but only in an older version. They
|
||||||
|
5
debian/control
vendored
5
debian/control
vendored
@ -3,11 +3,10 @@ Section: utils
|
|||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: Kiwix team <kiwix@kiwix.org>
|
Maintainer: Kiwix team <kiwix@kiwix.org>
|
||||||
Build-Depends: debhelper-compat (= 13),
|
Build-Depends: debhelper-compat (= 13),
|
||||||
libkiwix-dev (>= 9.3.0~),
|
libkiwix-dev (>= 10.0.0),
|
||||||
libmicrohttpd-dev,
|
libzim-dev (>= 7.2.0),
|
||||||
meson,
|
meson,
|
||||||
pkg-config,
|
pkg-config,
|
||||||
zlib1g-dev
|
|
||||||
Standards-Version: 4.5.0
|
Standards-Version: 4.5.0
|
||||||
Homepage: https://github.com/kiwix/kiwix-tools
|
Homepage: https://github.com/kiwix/kiwix-tools
|
||||||
Rules-Requires-Root: no
|
Rules-Requires-Root: no
|
||||||
|
14
meson.build
14
meson.build
@ -1,5 +1,5 @@
|
|||||||
project('kiwix-tools', 'cpp',
|
project('kiwix-tools', 'cpp',
|
||||||
version : '3.1.2',
|
version : '3.2.0',
|
||||||
license : 'GPL',
|
license : 'GPL',
|
||||||
default_options: ['c_std=c11', 'cpp_std=c++11'])
|
default_options: ['c_std=c11', 'cpp_std=c++11'])
|
||||||
|
|
||||||
@ -12,17 +12,11 @@ if static_linkage
|
|||||||
add_global_link_arguments('-static-libstdc++', '--static', language:'cpp')
|
add_global_link_arguments('-static-libstdc++', '--static', language:'cpp')
|
||||||
endif
|
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')
|
thread_dep = dependency('threads')
|
||||||
libkiwix_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage)
|
kiwixlib_dep = dependency('kiwix', version:'>=10.0.0', static:static_linkage)
|
||||||
microhttpd_dep = dependency('libmicrohttpd', static:static_linkage)
|
libzim_dep = dependency('libzim', version:'>=7.2.0', static:static_linkage)
|
||||||
z_dep = dependency('zlib', 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
|
if static_linkage
|
||||||
librt = compiler.find_library('rt', required:false)
|
librt = compiler.find_library('rt', required:false)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user