travis-ci: sphinx needs to have things in path

To build the sphinx/python doc, The order of the make, needs to be: - cmake -DPYTHON_BINDINGS=ON - make - make install - cmake -DPYTHON_BINDINGS=ON -DWITH_DOC=ON - make Make it so. Signed-off-by: Robin Getz <[email protected]>
analogdevicesinc · Apr 8, 2020 · 30bec38 · 30bec38
1 parent d52f8cd
commit 30bec38
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/CI/travis/make_linux b/CI/travis/make_linux
@@ -9,23 +9,10 @@ handle_default() {
 	mkdir -p build
 	cd build
 
-	# do not exit if the statement returns a non-true return value.
-	set +e
-	command doxygen -h >/dev/null 2>&1
-	if [ "$?" -eq "0" ] ; then
-		DOC_FOUND="-DWITH_DOC=ON"
-		echo "Found doxygen on CI, building WITH_DOC=ON"
-	else
-		DOC_FOUND=" "
-		echo "doxygen missing on CI"
-	fi
-	# set it back, to error immediately.
-	set -e
-
 	echo "### cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON"
-	echo "          -DPYTHON_BINDINGS=ON ${DOC_FOUND}"
+	echo "          -DPYTHON_BINDINGS=ON"
 	cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON \
-		-DPYTHON_BINDINGS=ON ${DOC_FOUND} ..
+		-DPYTHON_BINDINGS=ON ..
 
 	echo "### make"
 	make
@@ -37,6 +24,15 @@ handle_default() {
 		echo "### Deleting install_manifest.txt (created as root)"
 		sudo rm ./install_manifest.txt
 	fi
+	if command_exists sphinx-build ; then
+		# to build the python doc, libiio and py-iio need to be installed
+		# so we need to re-do some minor things now that they are
+		echo "### enable -DWITH_DOC=ON"
+		cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON \
+			-DPYTHON_BINDINGS=ON -DWITH_DOC=ON ..
+		echo "### make"
+		make
+	fi
 	echo "### make package"
 	make package
 	if [ -n "${GH_DOC_TOKEN}" ] && \