From 6bba5171912331edbd5b2da7ea3e3e4f3986709c Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Fri, 9 Sep 2016 14:02:56 -0700 Subject: [PATCH] Add python-pyparsing and correct version Change-Id: I92185b842e0c3d1789e1d49293bcd831281bb541 Signed-off-by: Ed Warnicke --- jjb/vpp/include-raw-vpp-docs.sh | 4 +++- vagrant/lib/bootstrap-functions.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh index c3551c720..e721d389d 100644 --- a/jjb/vpp/include-raw-vpp-docs.sh +++ b/jjb/vpp/include-raw-vpp-docs.sh @@ -8,7 +8,9 @@ set -xe -o pipefail [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" -[ "$VERSION" ] || VERSION=$(./build-root/scripts/version --rpm-version) +[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version) + +sudo apt-get -y install python-pyparsing make doxygen mkdir -p $(dirname ${RESOURCES_DIR}) diff --git a/vagrant/lib/bootstrap-functions.sh b/vagrant/lib/bootstrap-functions.sh index 4bd8d03f9..9a6067818 100644 --- a/vagrant/lib/bootstrap-functions.sh +++ b/vagrant/lib/bootstrap-functions.sh @@ -148,7 +148,7 @@ deb_install_pkgs() { apt-get install ${PACKAGES} # Specify documentation packages - DOC_PACKAGES="doxygen graphviz" + DOC_PACKAGES="doxygen graphviz python-pyparsing" apt-get install ${DOC_PACKAGES} } -- 2.16.6