Skip to content

Commit

Permalink
travis-ci: install man2html and turn on man pages in CI
Browse files Browse the repository at this point in the history
so that the builds will have these included.

Signed-off-by: Robin Getz <[email protected]>
  • Loading branch information
rgetz committed Apr 16, 2020
1 parent 7a75179 commit f27fc31
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
9 changes: 7 additions & 2 deletions CI/travis/before_install_linux
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

Expand All @@ -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
Expand Down
14 changes: 7 additions & 7 deletions CI/travis/make_linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f27fc31

Please sign in to comment.