From 1664b6bbf848ef13b330ced6f0c7ba63d70805d5 Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 10 Oct 2020 09:06:43 -0500
Subject: [PATCH] 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
---
 .travis.yml                                  |  2 ++
 .travis_scripts/travis.before_install.osx.sh |  1 -
 .travis_scripts/travis.install.linux.sh      | 11 +++--------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0554dc9..1e1e179 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,8 @@ matrix:
          CC="clang"
          LIB_TYPE=static
          BUILD_TYPE=release
+         PYTHONUSERBASE="$(pwd)/LOCAL"
+         PATH="$PYTHONUSERBASE/bin:$PATH"
       # before_install and install steps only needed for linux meson builds
       before_install:
           - source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh
diff --git a/.travis_scripts/travis.before_install.osx.sh b/.travis_scripts/travis.before_install.osx.sh
index 5d83c0c..e69de29 100644
--- a/.travis_scripts/travis.before_install.osx.sh
+++ b/.travis_scripts/travis.before_install.osx.sh
@@ -1 +0,0 @@
-# NOTHING TO DO HERE
diff --git a/.travis_scripts/travis.install.linux.sh b/.travis_scripts/travis.install.linux.sh
index 7c5846f..6495fef 100644
--- a/.travis_scripts/travis.install.linux.sh
+++ b/.travis_scripts/travis.install.linux.sh
@@ -1,10 +1,5 @@
 set -vex
 
-wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
-unzip -q ninja-linux.zip -d build
-
-pip3 install meson
-echo ${PATH}
-ls /usr/local
-ls /usr/local/bin
-export PATH="${PWD}"/build:/usr/local/bin:/usr/bin:${PATH}
+pip3 install --user meson ninja
+which meson
+which ninja