Skip to content

Commit

Permalink
docs+ci: Remove support for 12.04 and switch to Ubuntu 14.04 with Tra…
Browse files Browse the repository at this point in the history
…vis-CI builds

Change-Id: Id7020b73ce2505565fa5f084d8ebeb6bfc9a2c42
  • Loading branch information
cawka committed Sep 10, 2016
1 parent 03361aa commit 0167d58
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 57 deletions.
13 changes: 1 addition & 12 deletions .jenkins.d/01-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,7 @@ if has Ubuntu $NODE_LABELS; then
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
Expand Down
4 changes: 0 additions & 4 deletions .jenkins.d/10-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ git submodule update --init
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
Expand Down
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
35 changes: 3 additions & 32 deletions docs/source/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,14 @@ Portability
.. 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
Expand All @@ -46,7 +26,7 @@ Prerequisites
- ``libsqlite3``
- ``libcrypto++``
- ``pkg-config``
- Boost libraries >= 1.49
- Boost libraries >= 1.53

.. role:: red

Expand Down Expand Up @@ -81,16 +61,7 @@ development tools and libraries, and ndn-cxx prerequisites.

.. 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

Expand Down

0 comments on commit 0167d58

Please sign in to comment.