From 0fa22f0d1b163de4125a302fc62b50b1fcdc50db Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 24 May 2016 14:08:05 +0800 Subject: [PATCH] admin/build-doc: use doc_deps.deb.txt for build-deps instead also update `doc_deps.deb.txt` according to the changes in build-doc. Signed-off-by: Kefu Chai --- admin/build-doc | 15 +-------------- doc_deps.deb.txt | 4 +++- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/admin/build-doc b/admin/build-doc index 053ff492552..45b8974a919 100755 --- a/admin/build-doc +++ b/admin/build-doc @@ -7,20 +7,7 @@ TOPDIR=`pwd` install -d -m0755 build-doc if command -v dpkg >/dev/null; then - packages=' - git - gcc - python-dev - python-pip - python-virtualenv - libxml2-dev - libxslt1-dev - doxygen - ditaa - graphviz - ant - cython - zlib1g-dev' + packages=`cat ${TOPDIR}/doc_deps.deb.txt` for package in $packages; do if [ "$(dpkg --status -- $package 2>&1 | sed -n 's/^Status: //p')" != "install ok installed" ]; then # add a space after old values diff --git a/doc_deps.deb.txt b/doc_deps.deb.txt index 2020ca783be..2b8041bb568 100644 --- a/doc_deps.deb.txt +++ b/doc_deps.deb.txt @@ -1,10 +1,12 @@ +git +gcc python-dev python-pip python-virtualenv doxygen ditaa libxml2-dev -libxslt-dev +libxslt1-dev graphviz ant zlib1g-dev