build: reanimate the dead
Fix build with ndn-cxx 0.7.1 and ChronoSync 0.5.3
* Adapt to new API
* Upgrade to Qt5
* Several other bugs
Refs: #4563, #4087
Change-Id: Ic55d687caade08f557f9b9ec3e9569bc96798710
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 07f904c..261097c 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -19,11 +19,7 @@
sudo apt-get -qq -y install build-essential
sudo apt-get -qq -y install libssl-dev libsqlite3-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 install -qq -y qt4-dev-tools protobuf-compiler libprotobuf-dev libqt4-sql-sqlite
+ sudo apt-get -qq -y install libprotobuf-dev protobuf-compiler libevent-dev libcrypto++-dev
+ sudo apt-get -qq -y install libboost-all-dev
+ sudo apt-get -qq -y install qt5-default
fi
diff --git a/.jenkins.d/10-ndn-cxx.sh b/.jenkins.d/10-ndn-cxx.sh
index 32bc8e1..841aa3f 100755
--- a/.jenkins.d/10-ndn-cxx.sh
+++ b/.jenkins.d/10-ndn-cxx.sh
@@ -23,9 +23,9 @@
pushd ndn-cxx >/dev/null
-./waf configure -j1 --color=yes --enable-shared --disable-static --without-osx-keychain
-./waf -j1 --color=yes
-sudo ./waf install -j1 --color=yes
+./waf configure --color=yes --enable-shared --disable-static --without-osx-keychain
+./waf --color=yes
+sudo ./waf install --color=yes
popd >/dev/null
popd >/dev/null
diff --git a/.jenkins.d/11-chronosync.sh b/.jenkins.d/11-chronosync.sh
index 78aeab1..b7484fd 100755
--- a/.jenkins.d/11-chronosync.sh
+++ b/.jenkins.d/11-chronosync.sh
@@ -11,9 +11,9 @@
git submodule init
git submodule update
pushd ChronoSync >/dev/null
-sudo ./waf -j1 --color=yes distclean
-./waf -j1 --color=yes configure
-./waf -j1 --color=yes build
-sudo ./waf install -j1 --color=yes
+sudo ./waf --color=yes distclean
+./waf --color=yes configure
+./waf --color=yes build
+sudo ./waf install --color=yes
sudo ldconfig || true
popd >/dev/null
diff --git a/.jenkins.d/20-build.sh b/.jenkins.d/20-build.sh
index fca152a..4174800 100755
--- a/.jenkins.d/20-build.sh
+++ b/.jenkins.d/20-build.sh
@@ -3,22 +3,8 @@
set -e
# Cleanup
-sudo ./waf -j1 --color=yes distclean
-
-# Configure/build in release mode
-./waf -j1 --color=yes configure
-./waf -j1 --color=yes build
-
-# Cleanup
-sudo ./waf -j1 --color=yes distclean
-
-# Configure/build in debug mode
-./waf -j1 --color=yes configure --debug
-./waf -j1 --color=yes build
-
-# Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo ./waf --color=yes distclean
# Configure/build in optimized mode with tests
-./waf -j1 --color=yes configure --with-tests
-./waf -j1 --color=yes build
+./waf --color=yes configure --debug --with-tests
+./waf --color=yes build