docs+ci: Remove support for 12.04 and switch to Ubuntu 14.04 with Travis-CI builds
Change-Id: Id7020b73ce2505565fa5f084d8ebeb6bfc9a2c42
diff --git a/.jenkins.d/01-deps.sh b/.jenkins.d/01-deps.sh
index 9d49b08..204336f 100755
--- a/.jenkins.d/01-deps.sh
+++ b/.jenkins.d/01-deps.sh
@@ -17,18 +17,7 @@
set -x
sudo apt-get update -qq -y
sudo apt-get -qq -y install build-essential
- sudo apt-get -qq -y install libssl-dev libsqlite3-dev libcrypto++-dev
-
- if has Ubuntu-12.04 $NODE_LABELS; then
- sudo apt-get install -qq -y python-software-properties
- sudo add-apt-repository -y ppa:boost-latest/ppa
- sudo apt-get update -qq -y
- sudo apt-get install -qq -y libboost1.55-all-dev
- sudo apt-get install -qq -y python-gnomedesktop
- else
- sudo apt-get install -qq -y libboost-all-dev
- fi
-
+ sudo apt-get -qq -y install libssl-dev libsqlite3-dev libcrypto++-dev libboost-all-dev
sudo apt-get install -qq -y python-setuptools python-dev python-pygraphviz python-kiwi
sudo apt-get install -qq -y python-pygoocanvas python-gnome2
sudo apt-get install -qq -y python-rsvg ipython
diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index b0ec560..8af1fc4 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -13,10 +13,6 @@
sudo rm -Rf build/ .waf-1* .waf3-1*
find . -name '*.pyc' | sudo xargs rm -f
-if has Ubuntu-12.04 $NODE_LABELS; then
- EXTRA_FLAGS=" --boost-libs=/usr/lib/x86_64-linux-gnu"
-fi
-
# Configure/build in debug mode
./waf -j1 configure -d debug --enable-modules=ndnSIM --enable-examples --enable-tests $EXTRA_FLAGS
./waf -j1 build
diff --git a/.travis.yml b/.travis.yml
index 08fefa0..0e7b265 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,14 @@
-language: cpp
-os:
- - linux
+sudo: required
+language: generic
+os: linux
+dist: trusty
compiler:
- gcc
notifications:
email:
on_success: always
on_failure: always
-cache:
- - ccache
env:
- - NODE_LABELS="Linux Ubuntu Ubuntu-12.04"
-before_install:
- - travis_retry sudo apt-get install -qq ccache
+ - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
script:
- - export CXX="ccache $CXX"
- ./.jenkins
diff --git a/docs/source/getting-started.rst b/docs/source/getting-started.rst
index a55acf2..802daa2 100644
--- a/docs/source/getting-started.rst
+++ b/docs/source/getting-started.rst
@@ -7,34 +7,14 @@
.. image:: https://travis-ci.org/named-data-ndnSIM/ndnSIM.svg?branch=test-travis-ci
:target: https://travis-ci.org/named-data-ndnSIM/ndnSIM
-ndnSIM 2.0 has been successfully compiled and used on following platforms:
+ndnSIM 2.x has been successfully compiled and used on following platforms:
-- Ubuntu Linux 12.04 (see the note)
- Ubuntu Linux 14.04 (32- and 64-bit platform)
- Ubuntu Linux 16.04 (32- and 64-bit platform)
- OS X 10.9
- OS X 10.10
- OS X 10.11
-.. note::
- ndnSIM is currently cannot be compiled on Ubuntu Linux 12.04 with the packaged boost
- libraries (there is an `issue with boost 1.48 and gcc 4.6
- <https://svn.boost.org/trac/boost/ticket/6153>`_). It is still possible to compile ndnSIM
- on this platform, but either compiler or boost libraries (or both) need to get upgraded.
-
- More recent version of boost can be installed from "Boost C++ Libraries" team PPA::
-
- sudo apt-get install python-software-properties
- sudo add-apt-repository ppa:boost-latest/ppa
- sudo apt-get update
- sudo apt-get install libboost1.55-all-dev
-
- # add --boost-libs=/usr/lib/x86_64-linux-gnu to ./waf configure
- # ./waf configure --boost-libs=/usr/lib/x86_64-linux-gnu
-
- Make sure that all other version of boost libraries (``-dev`` packages) are removed,
- otherwise compilation will fail.
-
.. _requirements:
Prerequisites
@@ -46,7 +26,7 @@
- ``libsqlite3``
- ``libcrypto++``
- ``pkg-config``
-- Boost libraries >= 1.49
+- Boost libraries >= 1.53
.. role:: red
@@ -81,16 +61,7 @@
.. code-block:: bash
- sudo apt-get install build-essential libsqlite3-dev libcrypto++-dev
-
- # For Ubuntu 12.04
- sudo apt-get install python-software-properties
- sudo add-apt-repository ppa:boost-latest/ppa
- sudo apt-get update
- sudo apt-get install libboost1.55-all-dev
-
- # For all other Ubuntu versions
- sudo apt-get install libboost-all-dev
+ sudo apt-get install build-essential libsqlite3-dev libcrypto++-dev libboost-all-dev
* Fedora Linux