Skip to content

Commit 1664b6b

Browse files
committed
Try meson/ninja from pypi
This lets us simplify linux a little. However, we still want to test cmake, so there is only so much we can simplify. For OSX, we still need `clang-format` from homebrew. * Add PYTHONUSERBASE/bin to PATH for linux
1 parent 5d1cb30 commit 1664b6b

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ matrix:
4444
CC="clang"
4545
LIB_TYPE=static
4646
BUILD_TYPE=release
47+
PYTHONUSERBASE="$(pwd)/LOCAL"
48+
PATH="$PYTHONUSERBASE/bin:$PATH"
4749
# before_install and install steps only needed for linux meson builds
4850
before_install:
4951
- source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
# NOTHING TO DO HERE
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
set -vex
22

3-
wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
4-
unzip -q ninja-linux.zip -d build
5-
6-
pip3 install meson
7-
echo ${PATH}
8-
ls /usr/local
9-
ls /usr/local/bin
10-
export PATH="${PWD}"/build:/usr/local/bin:/usr/bin:${PATH}
3+
pip3 install --user meson ninja
4+
which meson
5+
which ninja

0 commit comments

Comments
 (0)