Travis: update to latest prereqs script from master

This commit is contained in:
Andrew Tridgell 2015-01-08 13:21:13 +11:00 committed by Randy Mackay
parent fbef07c08d
commit 9b9665153e

View File

@ -6,6 +6,7 @@ OPT="/opt"
BASE_PKGS="gawk make git arduino-core curl" BASE_PKGS="gawk make git arduino-core curl"
SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache" SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache"
AVR_PKGS="gcc-avr binutils-avr avr-libc"
PYTHON_PKGS="pymavlink MAVProxy droneapi" PYTHON_PKGS="pymavlink MAVProxy droneapi"
PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \ PX4_PKGS="python-serial python-argparse openocd flex bison libncurses5-dev \
autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \ autoconf texinfo build-essential libftdi-dev libtool zlib1g-dev \
@ -15,9 +16,9 @@ ASSUME_YES=false
# GNU Tools for ARM Embedded Processors # GNU Tools for ARM Embedded Processors
# (see https://launchpad.net/gcc-arm-embedded/) # (see https://launchpad.net/gcc-arm-embedded/)
ARM_ROOT="gcc-arm-none-eabi-4_8-2013q4" ARM_ROOT="gcc-arm-none-eabi-4_7-2014q2"
ARM_TARBALL="$ARM_ROOT-20131204-linux.tar.bz2" ARM_TARBALL="$ARM_ROOT-20140408-linux.tar.bz2"
ARM_TARBALL_URL="https://launchpad.net/gcc-arm-embedded/4.8/4.8-2013-q4-major/+download/$ARM_TARBALL" ARM_TARBALL_URL="http://firmware.diydrones.com/Tools/PX4-tools/$ARM_TARBALL"
# Ardupilot Tools # Ardupilot Tools
ARDUPILOT_TOOLS="ardupilot/Tools/autotest" ARDUPILOT_TOOLS="ardupilot/Tools/autotest"
@ -57,7 +58,7 @@ sudo usermod -a -G dialout $USER
$APT_GET remove modemmanager $APT_GET remove modemmanager
$APT_GET update $APT_GET update
$APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $APT_GET install $BASE_PKGS $SITL_PKGS $PX4_PKGS $UBUNTU64_PKGS $AVR_PKGS
sudo pip -q install $PYTHON_PKGS sudo pip -q install $PYTHON_PKGS
@ -69,6 +70,10 @@ if [ ! -d PX4NuttX ]; then
git clone https://github.com/diydrones/PX4NuttX.git git clone https://github.com/diydrones/PX4NuttX.git
fi fi
if [ ! -d uavcan ]; then
git clone https://github.com/diydrones/uavcan.git
fi
if [ ! -d VRNuttX ]; then if [ ! -d VRNuttX ]; then
git clone https://github.com/virtualrobotix/vrbrain_nuttx.git VRNuttX git clone https://github.com/virtualrobotix/vrbrain_nuttx.git VRNuttX
fi fi