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

Merge pull request #98 from kiwix/meson_test 

Stop using the deprecated (and broken) `mesontest`.
This commit is contained in:
Matthieu Gautier 2017-12-13 14:50:04 +00:00 committed by GitHub
parent 29157c96eb 6768631b25
commit afc32ff71e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwix-build.py
View File

@ -254,7 +254,7 @@ class BuildEnv:
self.meson_command = self._detect_meson() self.meson_command = self._detect_meson()
if not self.meson_command: if not self.meson_command:
sys.exit("ERROR: meson command not fount") sys.exit("ERROR: meson command not fount")
self.mesontest_command = "mesontest" self.mesontest_command = "meson test"
self.setup_build(options.target_platform) self.setup_build(options.target_platform)
self.setup_toolchains() self.setup_toolchains()
self.options = options self.options = options

2
travis/install_extra_deps.sh
View File

@ -6,7 +6,7 @@ orig_dir=$(pwd)
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq python3-pip zlib1g-dev libjpeg-dev sudo apt-get install -qq python3-pip zlib1g-dev libjpeg-dev
pip3 install --user meson pip3 install --user meson==0.43.0
pip3 install --user pillow pip3 install --user pillow
# ninja # ninja