From 78d25308786df2114d59919f0e389bafa3f9a346 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 28 May 2019 17:50:09 +0200 Subject: [PATCH 1/2] New version 2.0.0 --- Changelog | 3 ++- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 5cc0e1d..4b598c8 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -kiwix-tools 1.2.2 +kiwix-tools 2.0.0 ================= kiwix-manage @@ -6,6 +6,7 @@ kiwix-manage * Better usage() * Adding multiple files bug fix + * Remove download command. kiwix-serve ----------- diff --git a/meson.build b/meson.build index 3802141..cbb8e7b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-tools', 'cpp', - version : '1.2.1', + version : '2.0.0', license : 'GPL', default_options: ['c_std=c11', 'cpp_std=c++11', 'werror=true']) @@ -11,7 +11,7 @@ if static_linkage endif thread_dep = dependency('threads') -kiwixlib_dep = dependency('kiwix', version:'>=4.1.0', static:static_linkage) +kiwixlib_dep = dependency('kiwix', version:'>=5.1.0', static:static_linkage) microhttpd_dep = dependency('libmicrohttpd', static:static_linkage) z_dep = dependency('zlib', static:static_linkage) From 3e973521284c6112f138534150763fd6f33c9457 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 29 May 2019 10:54:52 +0200 Subject: [PATCH 2/2] [CI] Build on xenial. --- .travis.yml | 4 ++-- travis/install_deps.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f19c07..550e359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp -dist: trusty -sudo: required +dist: xenial +sudo: true cache: ccache install: travis/install_deps.sh script: travis/compile.sh diff --git a/travis/install_deps.sh b/travis/install_deps.sh index c0fed16..58674fd 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -3,7 +3,7 @@ set -e REPO_NAME=${TRAVIS_REPO_SLUG#*/} -ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz +ARCHIVE_NAME=deps_linux_xenial_${PLATFORM}_${REPO_NAME}.tar.xz # Packages. case ${PLATFORM} in @@ -46,3 +46,4 @@ sudo cp ninja /bin cd ${HOME} wget http://tmp.kiwix.org/ci/${ARCHIVE_NAME} tar xf ${HOME}/${ARCHIVE_NAME} +sudo ln -s travis ../ci_builder