Merge pull request #213 from kiwix/last_meson

Use last version of meson.

.travis.yml

@@ -11,7 +11,7 @@ branches:
 if: type != push OR tag IS present
 
 before_install:
-- PATH=$PATH:${HOME}/bin
+- PATH=$PATH:${HOME}/bin:${HOME}/.local/bin
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=$PATH:$(brew --prefix)/opt/gettext/bin; fi
 - '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc
   -K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
@@ -40,7 +40,12 @@ script:
     fi
     docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build
   else
-    travis/compile_all.py
+    if [[ $TRAVIS_OS_NAME = "linux" ]]
+    then
+      python3.5 travis/compile_all.py
+    else
+      python3 travis/compile_all.py
+    fi
   fi
 after_failure: travis/upload_all_log.sh
 deploy:
@@ -71,6 +76,7 @@ addons:
     packages: &common
       - cmake
       - autopoint
+      - python3.5
       - python3-pip
       - ctpp2-utils
       - libmagic-dev

kiwixbuild/dependencies/kiwix_lib.py

@@ -18,6 +18,8 @@ class Kiwixlib(Dependency):
         def configure_option(self):
             if self.buildEnv.platformInfo.build == 'android':
                 return '-Dandroid=true'
+            if self.buildEnv.platformInfo.build == 'iOS':
+                return '-Db_bitcode=true'
             return ''
 
         @property

kiwixbuild/dependencies/libzim.py

@@ -16,8 +16,9 @@ class Libzim(Dependency):
 
         @property
         def configure_option(self):
-            options = ""
             platformInfo = self.buildEnv.platformInfo
             if platformInfo.build == 'android':
-                options += "-DUSE_BUFFER_HEADER=false"
+                return "-DUSE_BUFFER_HEADER=false"
-            return options
+            if platformInfo.build == 'iOS':
+                return "-Db_bitcode=true"
+            return ""

kiwixbuild/versions.py

@@ -35,7 +35,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '13'
+base_deps_meta_version = '14'
 
 
 base_deps_versions = {

setup.py

@@ -35,7 +35,7 @@ setup(
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
-        'meson==0.43.0'
+        'meson'
     ],
     entry_points={
         'console_scripts': [

travis/install_extra_deps.sh

@@ -10,9 +10,12 @@ then
   wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
   unzip ninja-mac.zip ninja
 else
-  pip3 install --user --upgrade pip wheel
+  wget https://bootstrap.pypa.io/get-pip.py
-  pip3 install --user pillow
+  python3.5 get-pip.py --user
-  pip3 install --user .
+  python3.5 -m pip install --user --upgrade pip wheel
+  python3.5 -m pip install --user pillow
+  python3.5 -m pip install --user .
+  python3.5 -m pip show -f kiwix-build
 
   wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
   unzip ninja-linux.zip ninja