aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Travis: make arm compiler install unconditional

Browse Source
This commit is contained in:
Andrew Tridgell 2015-04-05 10:57:17 -07:00
parent 1315ed7ddf
commit 7048836d1e
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tools/scripts/install-travis-env.sh
View File

@ -6,6 +6,7 @@ set -v
CWD=$(pwd) CWD=$(pwd)
OPT="$HOME/opt" OPT="$HOME/opt"
echo "PATH=$PATH"
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 python-empy" SITL_PKGS="g++ python-pip python-matplotlib python-serial python-wxgtk2.8 python-scipy python-opencv python-numpy python-pyparsing ccache python-empy"
@ -71,24 +72,14 @@ fi
mkdir -p $OPT mkdir -p $OPT
if [ ! -d $OPT/$ARM_ROOT ]; then cd $OPT;
( wget $ARM_TARBALL_URL
cd $OPT; tar xjf ${ARM_TARBALL}
wget $ARM_TARBALL_URL; rm -f ${ARM_TARBALL}
tar xjf ${ARM_TARBALL};
rm ${ARM_TARBALL};
)
fi
exportline="export PATH=$OPT/$ARM_ROOT/bin:\$PATH"; exportline="export PATH=$OPT/$ARM_ROOT/bin:\$PATH";
if ! grep -Fxq "$exportline" ~/.profile ; then echo $exportline >> ~/.profile
echo $exportline >> ~/.profile
$exportline
fi
exportline2="export PATH=$CWD/$ARDUPILOT_TOOLS:\$PATH"; exportline2="export PATH=$CWD/$ARDUPILOT_TOOLS:\$PATH";
if ! grep -Fxq "$exportline2" ~/.profile ; then echo $exportline2 >> ~/.profile
echo $exportline2 >> ~/.profile $exportline2
$exportline2
fi