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`
This commit is contained in:
parent
97666b0fc9
commit
6ebd96c059
3
setup.py
3
setup.py
|
@ -34,6 +34,9 @@ setup(
|
||||||
],
|
],
|
||||||
packages=find_packages(),
|
packages=find_packages(),
|
||||||
include_package_data=True,
|
include_package_data=True,
|
||||||
|
install_requires=[
|
||||||
|
'meson==0.43.0'
|
||||||
|
],
|
||||||
entry_points={
|
entry_points={
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'kiwix-build = kiwixbuild:main'
|
'kiwix-build = kiwixbuild:main'
|
||||||
|
|
|
@ -11,8 +11,7 @@ import re
|
||||||
from urllib.request import urlretrieve
|
from urllib.request import urlretrieve
|
||||||
from urllib.error import URLError
|
from urllib.error import URLError
|
||||||
|
|
||||||
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
from kiwixbuild import dependency_versions
|
||||||
import dependency_versions
|
|
||||||
|
|
||||||
PLATFORM = environ['PLATFORM']
|
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):
|
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(target)
|
||||||
command.append('--hide-progress')
|
command.append('--hide-progress')
|
||||||
command.extend(['--target-platform', platform])
|
command.extend(['--target-platform', platform])
|
||||||
|
|
|
@ -2,15 +2,13 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
orig_dir=$(pwd)
|
|
||||||
|
|
||||||
pip3 install --user --upgrade pip wheel
|
pip3 install --user --upgrade pip wheel
|
||||||
pip3 install --user pillow meson==0.43.0
|
pip3 install --user pillow
|
||||||
|
|
||||||
|
pip3 install --user .
|
||||||
|
|
||||||
# ninja
|
# ninja
|
||||||
wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
|
wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
|
||||||
unzip ninja-linux.zip ninja
|
unzip ninja-linux.zip ninja
|
||||||
cp ninja $HOME/bin
|
cp ninja $HOME/bin
|
||||||
|
|
||||||
cd $orig_dir
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue