diff --git a/.travis.yml b/.travis.yml index 612a3099c..bf09f8c3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ addons: apt: packages: - cmake + - python3.5 - python3-pip - libbz2-dev - ccache diff --git a/ChangeLog b/ChangeLog index 22351472d..ae34ddec0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +kiwix-lib 4.0.0 +=============== + + * [API break] Remove support for external index. + * Move to the mustache templating system instead of ctpp2. + * Make meson.build works for meson>=0.43.0 + * [API break] Move the basic tools from the `common` directory to `tools`. + kiwix-lib 3.1.1 =============== diff --git a/meson.build b/meson.build index 88b1d9836..45c463817 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-lib', 'cpp', - version : '3.1.1', + version : '4.0.0', license : 'GPL', default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) diff --git a/travis/install_deps.sh b/travis/install_deps.sh index 7687d07b7..9c30e6a65 100755 --- a/travis/install_deps.sh +++ b/travis/install_deps.sh @@ -9,12 +9,16 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz cd $HOME if [[ "$TRAVIS_OS_NAME" == "osx" ]] then - pip3 install meson==0.43.0 + pip3 install meson wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip unzip ninja-mac.zip ninja else - pip3 install --user meson==0.43.0 + wget https://bootstrap.pypa.io/get-pip.py + python3.5 get-pip.py --user + + python3.5 -m pip install --user --upgrade pip + python3.5 -m pip install --user meson wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip ninja-linux.zip ninja