summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rwxr-xr-xmisc/travis/scons-local-osx.sh18
2 files changed, 2 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index a8bc8289e4..c3302cf806 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,7 +87,8 @@ install:
misc/travis/android-tools-linux.sh;
fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
- misc/travis/scons-local-osx.sh;
+ pip install --user scons;
+ export PATH=${PATH}:/Users/travis/Library/Python/2.7/bin;
fi
- if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$PLATFORM" = "android" ]; then
misc/travis/android-tools-osx.sh;
diff --git a/misc/travis/scons-local-osx.sh b/misc/travis/scons-local-osx.sh
deleted file mode 100755
index fe7b43aadc..0000000000
--- a/misc/travis/scons-local-osx.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-echo
-echo "Download and install Scons local package ..."
-echo
-
-echo "Downloading sources ..."
-curl -L -O https://downloads.sourceforge.net/scons/scons-local-3.0.1.zip # latest version available here: http://scons.org/pages/download.html
-
-echo "Extracting to build directory ..."
-unzip -qq -n scons-local-3.0.1.zip -d $TRAVIS_BUILD_DIR/scons-local
-
-echo "Installing symlinks ..."
-ln -s $TRAVIS_BUILD_DIR/scons-local/scons.py /usr/local/bin/scons
-
-echo
-echo "Done!"
-echo