docs+ci: Ubuntu 12.04 is no longer supported
Change-Id: I423a0f22662383f52413d12dc26d2a4ed08579e2
Refs: #3599, #3600
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 6e1d94f..b9ceb8b 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 libpcap-dev
+ sudo apt-get -qq update
+ sudo apt-get -qq install build-essential pkg-config libboost-all-dev \
+ libcrypto++-dev libsqlite3-dev libpcap-dev
fi
diff --git a/.jenkins.d/README.md b/.jenkins.d/README.md
index b1a3fbf..386e2db 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 3d94d74..079fb03 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -16,7 +16,7 @@
On OS X, NFD can be installed with MacPorts. Refer to :ref:`Install NFD Using the NDN
MacPorts Repository on OS X` for more details.
-On Ubuntu 12.04, 14.04, or 14.10 NFD can be installed from NDN PPA repository. Refer to
+On Ubuntu 14.04 and 16.04, NFD can be installed from NDN PPA repository. Refer to
:ref:`Install NFD Using the NDN PPA Repository on Ubuntu Linux`.
Future releases could include support for other platforms. Please send us feedback on the
@@ -72,7 +72,7 @@
Install NFD Using the NDN PPA Repository on Ubuntu Linux
--------------------------------------------------------
-NFD binaries and related tools for Ubuntu 12.04, 14.04, or 14.10 can be installed using PPA
+NFD binaries and related tools for Ubuntu 14.04 and 16.04 can be installed using PPA
packages from named-data repository. First, you will need to add ``named-data/ppa``
repository to binary package sources and update list of available packages.
@@ -80,21 +80,12 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To simplify adding new PPA repositories, Ubuntu provides ``add-apt-repository`` tool,
-which is not installed by default on some platforms.
-
-On Ubuntu **12.04**:
-
-::
-
- sudo apt-get install python-software-properties
-
-On Ubuntu **14.04** or **14.10**:
+which is not installed by default on some systems.
::
sudo apt-get install software-properties-common
-
Adding NDN PPA
~~~~~~~~~~~~~~
@@ -147,13 +138,13 @@
- ``pkg-config``
- On OS X 10.8, 10.9, and 10.10 with MacPorts:
+ On OS X with MacPorts:
::
sudo port install pkgconfig
- On Ubuntu >= 12.04:
+ On Ubuntu:
::
@@ -161,9 +152,9 @@
- ``libpcap``
- Comes with the base system on OS X 10.8, 10.9, and 10.10.
+ Comes with the base system on OS X 10.8, 10.9, 10.10, and 10.11.
- On Ubuntu >= 12.04:
+ On Ubuntu:
::
@@ -175,14 +166,14 @@
- ``graphviz``
- ``python-sphinx``
- On OS X 10.8, 10.9, and 10.10 with MacPorts:
+ On OS X with MacPorts:
::
sudo port install doxygen graphviz py27-sphinx sphinx_select
sudo port select sphinx py27-sphinx
- On Ubuntu >= 12.04:
+ On Ubuntu:
::