Still messing with travis

dlib/travis/build-and-test.sh

@@ -47,6 +47,12 @@ if [ "$VARIANT" = "old-cmake" ]; then
   rm -rf *
   $CMAKEDIR/3.5/bin/cmake ../dlib/test/tools 
   $CMAKEDIR/3.5/bin/cmake --build .  -- -j 2
+
+
+  # just to make sure there isn't anything funny about building standalone dlib
+  rm -rf *
+  $CMAKEDIR/2.8/bin/cmake ../dlib 
+  $CMAKEDIR/2.8/bin/cmake --build .  -- -j 2
 fi
 
 if [ "$VARIANT" = "examples" ]; then

dlib/travis/get-old-cmakes.sh

 #!/usr/bin/env bash
 
-# Exit if anything fails.
-set -eux
 
-OUTDIR=cmake
 
 
-echo "Checking if cmake already downloaded"
-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"
-    rm -rf $OUTDIR
-fi
+# Make sure the binaries are there, if not then delete the directory and redownload
+./cmake/2.8/bin/cmake --version || rm -rf cmake
+./cmake/3.1/bin/cmake --version || rm -rf cmake
+./cmake/3.5/bin/cmake --version || rm -rf cmake
 
 
-if [[ ! -d $OUTDIR ]]; then
+# Exit if anything fails.
+set -eux
+
+if [[ ! -d cmake ]]; then
   echo "Downloading cmake..."
 
   # Travis requires 64bit binaries but they aren't available for this version of cmake, so we build from source
   CMAKE_URL="https://cmake.org/files/v2.8/cmake-2.8.12.1.tar.gz"
-  mkdir -p $OUTDIR/2.8
-  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/2.8
-  cd $OUTDIR/2.8
+  mkdir -p cmake/2.8
+  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/2.8
+  pushd cmake/2.8
   ./configure
   make -j2
-  cd ..
+  popd
 
   CMAKE_URL="http://www.cmake.org/files/v3.1/cmake-3.1.2-Linux-x86_64.tar.gz"
-  mkdir -p $OUTDIR/3.1
-  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/3.1
+  mkdir -p cmake/3.1
+  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/3.1
 
   CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
-  mkdir -p $OUTDIR/3.5
-  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C $OUTDIR/3.5
+  mkdir -p cmake/3.5
+  wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake/3.5
 
 fi
+
+
+#make sure the binaries are really there
+./cmake/2.8/bin/cmake --version
+./cmake/3.1/bin/cmake --version 
+./cmake/3.5/bin/cmake --version 
+