smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Zimwriterfs need libmagic-dev. 

Install the package `libmagic-dev`.

There is no precompiled libmagic package from cross-compilation and we
are mainly using zimwriterfs only on linux.
This commit is contained in:
Matthieu Gautier 2017-11-28 12:24:39 +00:00
parent 7fc557dd44
commit 53ecc65b9d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwix-build.py
View File

@ -75,7 +75,7 @@ PACKAGE_NAME_MAPPERS = {
'COMMON': _fedora_common + ['java-1.8.0-openjdk-devel'] 'COMMON': _fedora_common + ['java-1.8.0-openjdk-devel']
}, },
'debian_native_dyn': { 'debian_native_dyn': {
'COMMON': _debian_common + ['libbz2-dev'], 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'],
'zlib': ['zlib1g-dev'], 'zlib': ['zlib1g-dev'],
'uuid': ['uuid-dev'], 'uuid': ['uuid-dev'],
'ctpp2': ['libctpp2-dev'], 'ctpp2': ['libctpp2-dev'],
@ -83,7 +83,7 @@ PACKAGE_NAME_MAPPERS = {
'libmicrohttpd': ['libmicrohttpd-dev', 'ccache'] 'libmicrohttpd': ['libmicrohttpd-dev', 'ccache']
}, },
'debian_native_static': { 'debian_native_static': {
'COMMON': _debian_common + ['libbz2-dev'], 'COMMON': _debian_common + ['libbz2-dev', 'libmagic-dev'],
'zlib': ['zlib1g-dev'], 'zlib': ['zlib1g-dev'],
'uuid': ['uuid-dev'], 'uuid': ['uuid-dev'],
'ctpp2': ['libctpp2-dev'], 'ctpp2': ['libctpp2-dev'],

12
travis/compile_all.sh
View File

@ -23,8 +23,11 @@ then
if [[ ${PLATFORM} = android* ]] if [[ ${PLATFORM} = android* ]]
then then
TARGETS="libzim kiwix-lib kiwix-android" TARGETS="libzim kiwix-lib kiwix-android"
else elif [[ ${PLATFORM} =~ native_* ]]
then
TARGETS="libzim zimwriterfs zim-tools kiwix-lib kiwix-tools" TARGETS="libzim zimwriterfs zim-tools kiwix-lib kiwix-tools"
else
TARGETS="libzim zim-tools kiwix-lib kiwix-tools"
fi fi
for TARGET in ${TARGETS} for TARGET in ${TARGETS}
@ -72,12 +75,10 @@ EOF
win32_static) win32_static)
make_nightly_archive kiwix-tools_win32 "kiwix-install.exe kiwix-manage.exe kiwix-read.exe kiwix-search.exe kiwix-serve.exe" make_nightly_archive kiwix-tools_win32 "kiwix-install.exe kiwix-manage.exe kiwix-read.exe kiwix-search.exe kiwix-serve.exe"
make_nightly_archive zim-tools_win32 "zimbench.exe zimdump.exe zimsearch.exe zimdiff.exe zimpatch.exe zimsplit.exe" make_nightly_archive zim-tools_win32 "zimbench.exe zimdump.exe zimsearch.exe zimdiff.exe zimpatch.exe zimsplit.exe"
make_nightly_archive zimwriterfs_win32 "zimwriterfs.exe"
;; ;;
armhf_static) armhf_static)
make_nightly_archive kiwix-tools_armhf "kiwix-install kiwix-manage kiwix-read kiwix-search kiwix-serve" make_nightly_archive kiwix-tools_armhf "kiwix-install kiwix-manage kiwix-read kiwix-search kiwix-serve"
make_nightly_archive zim-tools_armhf "zimbench zimdump zimsearch zimdiff zimpatch zimsplit" make_nightly_archive zim-tools_armhf "zimbench zimdump zimsearch zimdiff zimpatch zimsplit"
make_nightly_archive zimwriterfs_armhf "zimwriterfs"
;; ;;
android_*) android_*)
APK_NAME="kiwix-${PLATFORM}" APK_NAME="kiwix-${PLATFORM}"
@ -91,8 +92,11 @@ else
if [[ ${PLATFORM} = android* ]] if [[ ${PLATFORM} = android* ]]
then then
TARGETS="kiwix-android" TARGETS="kiwix-android"
else elif [[ ${PLATFORM} =~ native_* ]]
then
TARGETS="kiwix-tools zim-tools zimwriterfs" TARGETS="kiwix-tools zim-tools zimwriterfs"
else
TARGETS="kiwix-tools zim-tools"
fi fi
for TARGET in ${TARGETS} for TARGET in ${TARGETS}
do do