docs+ci: Ubuntu 12.04 is no longer supported
Change-Id: Icff6724c9b76b7e85541b3dcc88408c07f7fd312
Refs: #3599, #3600
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index c32219b..241ffe5 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -17,13 +17,8 @@
fi
if has Ubuntu $NODE_LABELS; then
- BOOST_PKG=libboost-all-dev
- if has Ubuntu-12.04 $NODE_LABELS; then
- BOOST_PKG=libboost1.48-all-dev
- fi
-
set -x
- sudo apt-get update -qq -y
- sudo apt-get -qq -y install build-essential pkg-config $BOOST_PKG \
- libcrypto++-dev libsqlite3-dev
+ sudo apt-get -qq update
+ sudo apt-get -qq install build-essential pkg-config libboost-all-dev \
+ libcrypto++-dev libsqlite3-dev
fi
diff --git a/.jenkins.d/README.md b/.jenkins.d/README.md
index 4f5e930..4720a52 100644
--- a/.jenkins.d/README.md
+++ b/.jenkins.d/README.md
@@ -13,13 +13,13 @@
* `[OS_TYPE]`: `Linux`
* `[DISTRO_TYPE]`: `Ubuntu`
- * `[DISTRO_VERSION]`: `Ubuntu-12.04`, `Ubuntu-14.04`, `Ubuntu-15.04`
+ * `[DISTRO_VERSION]`: `Ubuntu-14.04`, `Ubuntu-16.04`
Possible values of OSX OS:
* `[OS_TYPE]`: `OSX`
* `[DISTRO_TYPE]`: `OSX` (can be absent)
- * `[DISTRO_VERSION]`: `OSX-10.10`, `OSX-10.9`, `OSX-10.8`, `OSX-10.7`
+ * `[DISTRO_VERSION]`: `OSX-10.11`, `OSX-10.10`, `OSX-10.9`, `OSX-10.8`
- `JOB_NAME`: optional variable to define type of the job. Depending on the defined job type,
the build scripts can perform different tasks.
diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index bfc57a0..09e3e27 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -9,12 +9,12 @@
ndn-cxx uses continuous integration and has been tested on the following
platforms:
-- Ubuntu 12.04 (64-bit and 32-bit)
- Ubuntu 14.04 (64-bit and 32-bit)
-- Ubuntu 15.10 (64-bit)
+- Ubuntu 16.04 (64-bit and 32-bit)
- OS X 10.8
- OS X 10.9
- OS X 10.10
+- OS X 10.11
ndn-cxx is known to work on the following platforms, although they are not officially
supported:
@@ -60,14 +60,7 @@
In a terminal, enter::
- sudo apt-get install build-essential
- sudo apt-get install libsqlite3-dev libcrypto++-dev
-
- # For Ubuntu 12.04
- sudo apt-get install libboost1.48-all-dev
-
- # For all other Ubuntu versions
- sudo apt-get install libboost-all-dev
+ sudo apt-get install build-essential libcrypto++-dev libsqlite3-dev libboost-all-dev
- Fedora