kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-22 11:22:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from kiwix/update_to_api

Browse Source 
Update to api
This commit is contained in:
Matthieu Gautier 2019-01-23 17:42:59 +01:00 committed by GitHub
commit 3a80951c23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/manager/kiwix-manage.cpp
View File

@ -21,8 +21,8 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <getopt.h> #include <getopt.h>
#include <kiwix/common/pathTools.h> #include <kiwix/tools/pathTools.h>
#include <kiwix/common/stringTools.h> #include <kiwix/tools/stringTools.h>
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include <kiwix/downloader.h> #include <kiwix/downloader.h>
#include <cstdlib> #include <cstdlib>

8
src/server/kiwix-serve.cpp
View File

@ -44,10 +44,10 @@ extern "C" {
#endif #endif
#include <getopt.h> #include <getopt.h>
#include <kiwix/common/otherTools.h> #include <kiwix/tools/otherTools.h>
#include <kiwix/common/pathTools.h> #include <kiwix/tools/pathTools.h>
#include <kiwix/common/regexTools.h> #include <kiwix/tools/regexTools.h>
#include <kiwix/common/stringTools.h> #include <kiwix/tools/stringTools.h>
#include <kiwix/manager.h> #include <kiwix/manager.h>
#include <kiwix/reader.h> #include <kiwix/reader.h>
#include <kiwix/searcher.h> #include <kiwix/searcher.h>

2
travis/compile.sh
View File

@ -24,6 +24,6 @@ esac
cd ${TRAVIS_BUILD_DIR} cd ${TRAVIS_BUILD_DIR}
export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/x86_64-linux-gnu/pkgconfig export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/x86_64-linux-gnu/pkgconfig
export PATH=${INSTALL_DIR}/bin:$PATH export PATH=${INSTALL_DIR}/bin:$PATH
meson . build -Dctpp2-install-prefix=${INSTALL_DIR} ${MESON_OPTION} meson . build ${MESON_OPTION}
cd build cd build
ninja ninja

4
travis/install_deps.sh
View File

@ -8,10 +8,10 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
# Packages. # Packages.
case ${PLATFORM} in case ${PLATFORM} in
"native_static") "native_static")
PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev" PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev"
;; ;;
"native_dyn") "native_dyn")
PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev libmicrohttpd-dev" PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libmicrohttpd-dev"
;; ;;
"win32_static") "win32_static")
PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache" PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache"