Merge branch 'follow_me' of https://github.com/dronecore/DroneCore in…

…to FollowMe28Nov17

Dockerfile

@@ -10,25 +10,30 @@ MAINTAINER Julian Oes <julian@oes.ch>
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-	&& apt-get -y --quiet --no-install-recommends install \
-		cmake \
-		build-essential \
-		colordiff \
-		astyle \
-		git \
-		libcurl4-openssl-dev \
-		doxygen \
+    && apt-get -y --quiet --no-install-recommends install \
+        cmake \
+        build-essential \
+        colordiff \
+        git \
+        libcurl4-openssl-dev \
+        doxygen \
         autoconf \
         libtool \
+        wget \
         ca-certificates \
         autoconf \
         automake \
         python \
         python-pip \
         libtinyxml2-dev \
-	&& apt-get -y autoremove \
-	&& apt-get clean autoclean \
-	&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
+    && apt-get -y autoremove \
+    && apt-get clean autoclean \
+    && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
+
+# We need the latest astyle version
+RUN wget http://archive.ubuntu.com/ubuntu/pool/universe/a/astyle/astyle_3.0.1-1ubuntu1_amd64.deb \
+    && dpkg -i astyle_3.0.1-1ubuntu1_amd64.deb \
+    && rm astyle_3.0.1-1ubuntu1_amd64.deb
 
 RUN pip install grpcio grpcio-tools
 

generate_docs.sh

@@ -22,16 +22,10 @@ fi
 install_prefix="$source_dir/install"
 
 if [ "$skip_checks" = false ]; then
-    # We need to do a clean build, otherwise the INSTALL_PREFIX has no effect.
-    if [ -e $source_dir/build/ ]; then
-        echo "Build directory ($install_prefix) already exists, you should do 'make clean' first."
-        exit 1
-    fi
-
-    # Check for leftover install artefacts.
-    if [ -e $install_prefix ]; then
-        echo "Install directory ($install_prefix) already exists, you should delete it up first."
-        exit 1
+    # Clean-up build & install directory
+    if [ -e $source_dir/build/ ] || [ -e $install_prefix ] ; then
+	printf "Clean-up your build & install directory using below command.\nmake clean && rm -rf $install_prefix\n"
+	exit 1
     fi
 fi