From 6ebd96c05994123c8858a4593ed08eb2dd1213cc Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 4 Apr 2018 15:20:40 +0200
Subject: [PATCH] Adapte travis to new file architectures.

- kiwix-build is installable, so let's install it in travisCI
- Declare the dependency to meson in the setup.py
- As kiwixbuild is installed, we don't need to change the `sys.path`
---
 setup.py                     | 3 +++
 travis/compile_all.py        | 5 ++---
 travis/install_extra_deps.sh | 8 +++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index 514324a..3c238ed 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,9 @@ setup(
     ],
     packages=find_packages(),
     include_package_data=True,
+    install_requires=[
+        'meson==0.43.0'
+    ],
     entry_points={
         'console_scripts': [
             'kiwix-build = kiwixbuild:main'
diff --git a/travis/compile_all.py b/travis/compile_all.py
index 6c809ac..047bfe4 100755
--- a/travis/compile_all.py
+++ b/travis/compile_all.py
@@ -11,8 +11,7 @@ import re
 from urllib.request import urlretrieve
 from urllib.error import URLError
 
-sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import dependency_versions
+from kiwixbuild import dependency_versions
 
 PLATFORM = environ['PLATFORM']
 
@@ -56,7 +55,7 @@ Generated at {date}
 
 
 def run_kiwix_build(target, platform, build_deps_only=False, make_release=False, make_dist=False):
-    command = [str(Path(environ['TRAVIS_BUILD_DIR'])/'kiwix-build.py')]
+    command = ['kiwix-build']
     command.append(target)
     command.append('--hide-progress')
     command.extend(['--target-platform', platform])
diff --git a/travis/install_extra_deps.sh b/travis/install_extra_deps.sh
index 107021a..f9e8489 100755
--- a/travis/install_extra_deps.sh
+++ b/travis/install_extra_deps.sh
@@ -2,15 +2,13 @@
 
 set -e
 
-orig_dir=$(pwd)
-
 pip3 install --user --upgrade pip wheel
-pip3 install --user pillow meson==0.43.0
+pip3 install --user pillow
+
+pip3 install --user .
 
 # ninja
 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
 unzip ninja-linux.zip ninja
 cp ninja $HOME/bin
 
-cd $orig_dir
-