Commit 526fa502 authored by Davis King's avatar Davis King

more travis debug

parent 963bc0fe
...@@ -35,32 +35,20 @@ fi ...@@ -35,32 +35,20 @@ fi
if [ "$VARIANT" = "old-cmake" ]; then if [ "$VARIANT" = "old-cmake" ]; then
mkdir build mkdir build
cd build cd build
ls .. CMAKEDIR=../cmake2
ls ../cmake ls $CMAKEDIR
ls ../cmake/2.8 ls $CMAKEDIR/2.8/bin/cmake
ls ../cmake/2.8/bin/
ls -l ../cmake/2.8/bin/cmake
echo echo what is the deal > wtf $CMAKEDIR/2.8/bin/cmake ../dlib/test/tools
chmod u+x ./wtf $CMAKEDIR/2.8/bin/cmake --build . -- -j 2
ls -l wtf
./wtf
cp ../cmake/2.8/bin/cmake wtf
ls -l wtf
./wtf --version
../cmake/2.8/bin/cmake --version
../cmake/2.8/bin/cmake ../dlib/test/tools
../cmake/2.8/bin/cmake --build . -- -j 2
rm -rf * rm -rf *
../cmake/3.1/bin/cmake ../dlib/test/tools $CMAKEDIR/3.1/bin/cmake ../dlib/test/tools
../cmake/3.1/bin/cmake --build . -- -j 2 $CMAKEDIR/3.1/bin/cmake --build . -- -j 2
rm -rf * rm -rf *
../cmake/3.5/bin/cmake ../dlib/test/tools $CMAKEDIR/3.5/bin/cmake ../dlib/test/tools
../cmake/3.5/bin/cmake --build . -- -j 2 $CMAKEDIR/3.5/bin/cmake --build . -- -j 2
fi fi
if [ "$VARIANT" = "examples" ]; then if [ "$VARIANT" = "examples" ]; then
......
...@@ -3,26 +3,28 @@ ...@@ -3,26 +3,28 @@
# Exit if anything fails. # Exit if anything fails.
set -eux set -eux
OUTDIR=cmake2
echo "Checking if cmake already downloaded" echo "Checking if cmake already downloaded"
if [ ! -x cmake/2.8/bin/cmake ] || [ ! -x cmake/3.1/bin/cmake ] || [ ! -x cmake/3.5/bin/cmake ]; then if [ ! -x $OUTDIR/2.8/bin/cmake ] || [ ! -x $OUTDIR/3.1/bin/cmake ] || [ ! -x $OUTDIR/3.5/bin/cmake ]; then
echo "Didn't find it, clearing old cmake folder" echo "Didn't find it, clearing old cmake folder"
rm -rf cmake rm -rf $OUTDIR
fi fi
if [[ ! -d cmake ]]; then if [[ ! -d $OUTDIR ]]; then
echo "Downloading cmake..." echo "Downloading cmake..."
CMAKE_URL="http://www.cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.tar.gz" CMAKE_URL="http://www.cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.tar.gz"
mkdir -p cmake/2.8 mkdir -p $OUTDIR/2.8
wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/2.8 wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/2.8
CMAKE_URL="http://www.cmake.org/files/v3.1/cmake-3.1.2-Linux-x86_64.tar.gz" CMAKE_URL="http://www.cmake.org/files/v3.1/cmake-3.1.2-Linux-x86_64.tar.gz"
mkdir -p cmake/3.1 mkdir -p $OUTDIR/3.1
wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/3.1 wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/3.1
CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz" CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
mkdir -p cmake/3.5 mkdir -p $OUTDIR/3.5
wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/3.5 wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/3.5
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment