smallsolar/kiwix-build
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-build.git synced 2025-06-28 05:49:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from kiwix/fix_travis_build

Browse Source 
Fix installation of meson and pillow (pip3) in travis.
This commit is contained in:
Matthieu Gautier
2017-09-11 15:15:37 +02:00
committed by GitHub
parent f3a3fa754a e76ca14d63
commit 9ab444521c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dependencies.py
View File

@ -377,7 +377,7 @@ class KiwixAndroid(Dependency):
def _configure(self, context): def _configure(self, context):
if not os.path.exists(self.build_path): if not os.path.exists(self.build_path):
shutil.copytree(self.source_path, self.build_path) shutil.copytree(self.source_path, self.build_path, symlinks=True)
try: try:
shutil.rmtree(pj(self.build_path, 'kiwixlib', 'src', 'main')) shutil.rmtree(pj(self.build_path, 'kiwixlib', 'src', 'main'))
except FileNotFoundError: except FileNotFoundError:

4
travis/install_extra_deps.sh
View File

@ -6,8 +6,8 @@ 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 meson pip3 install --user meson
pip3 install pillow pip3 install --user pillow
# ninja # ninja
git clone git://github.com/ninja-build/ninja.git git clone git://github.com/ninja-build/ninja.git