build+ci: Synchronize build and CI scripts with ndn-cxx/NFD
This commit also fixes a minor problem causing compilation warnings.
Change-Id: I0c04d58fe9df24f181947b9fde1346283402fc7b
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 7f312a3..4a4db28 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -1,27 +1,21 @@
#!/usr/bin/env bash
-set -x
set -e
JDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
source "$JDIR"/util.sh
-[[ -n $NODE_LABELS ]] || exit 0
+set -x
if has OSX $NODE_LABELS; then
brew update
brew upgrade
- brew install boost pkg-config cryptopp
+ brew install boost pkg-config cryptopp openssl
brew cleanup
fi
if has Ubuntu $NODE_LABELS; then
- sudo apt-get update -qq -y
- sudo apt-get -qq -y install build-essential pkg-config
- sudo apt-get -qq -y install libcrypto++-dev
-
- if has Ubuntu-12.04 $NODE_LABELS; then
- sudo apt-get install -qq -y libboost1.48-all-dev
- else
- sudo apt-get install -qq -y libboost-all-dev
- fi
+ sudo apt-get -qq update
+ sudo apt-get -qq install build-essential pkg-config libboost-all-dev \
+ libcrypto++-dev libsqlite3-dev libssl-dev \
+ libpcap-dev
fi