From f27fc31378c40932d0e710eb950dd6b5843bb287 Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Thu, 9 Apr 2020 18:50:04 -0400 Subject: [PATCH] travis-ci: install man2html and turn on man pages in CI so that the builds will have these included. Signed-off-by: Robin Getz --- CI/travis/before_install_linux | 9 +++++++-- CI/travis/make_linux | 14 +++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CI/travis/before_install_linux b/CI/travis/before_install_linux index e006cc589..7c8b7ad52 100755 --- a/CI/travis/before_install_linux +++ b/CI/travis/before_install_linux @@ -14,6 +14,11 @@ install_sphinx() { } handle_centos() { + # needed for man2html and a few other popular tools + yum search epel-release + yum info epel-release + yum -y install epel-release + # FIXME: see about adding `libserialport-dev` from EPEL ; maybe libusb-1.0.0-devel... yum -y groupinstall 'Development Tools' yum -y install cmake libxml2-devel libusb1-devel libaio-devel \ @@ -31,7 +36,7 @@ handle_centos() { # CENTOS 6 will has issues with sphinx if is_centos_at_least_ver "7" ; then - yum -y install doxygen + yum -y install doxygen man2html install_sphinx fi @@ -54,7 +59,7 @@ handle_default() { bzip2 gzip flex bison git lsb-release python3-pip if [ -n "${GH_DOC_TOKEN}" ] ; then - sudo apt-get install -y doxygen + sudo apt-get install -y doxygen man2html install_sphinx fi if [ `sudo apt-cache search libserialport-dev | wc -l` -gt 0 ] ; then diff --git a/CI/travis/make_linux b/CI/travis/make_linux index c808d74c5..0189a854d 100755 --- a/CI/travis/make_linux +++ b/CI/travis/make_linux @@ -9,10 +9,10 @@ handle_default() { mkdir -p build cd build - echo "### cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON" - echo " -DPYTHON_BINDINGS=ON" - cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON \ - -DPYTHON_BINDINGS=ON .. + FLAGS="-DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON -DPYTHON_BINDINGS=ON" + + echo "### cmake ${FLAGS}" + cmake ${FLAGS} .. echo "### make" make @@ -27,9 +27,9 @@ handle_default() { 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 .. + FLAGS="${FLAGS} -DWITH_DOC=ON -DWITH_MAN=ON" + echo "### cmake ${FLAGS}" + cmake ${FLAGS} .. echo "### make" make fi