docs: Correct Ubuntu installation instructions
Now should work with 18.04
Change-Id: I272c76ea93e1e075f5e162f868a859f207e2804e
diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index 37a7f44..f0fb72e 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -14,7 +14,9 @@
find . -name '*.pyc' | sudo xargs rm -f
# Configure/build in debug mode
-export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
+if has OSX $NODE_LABELS; then
+ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
+fi
./waf -j${WAF_JOBS:-1} configure -d debug --enable-examples --enable-tests $EXTRA_FLAGS
./waf -j${WAF_JOBS:-1} build
diff --git a/.travis.yml b/.travis.yml
index 127eddf..08e40e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,21 @@
sudo: required
language: generic
+env:
+ global:
+ - WAF_JOBS=2
matrix:
include:
- os: linux
- dist: trusty
+ dist: xenial
env:
- CXX=g++
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
- - os: linux
- dist: trusty
- env:
- - CXX=clang++
- - NODE_LABELS="Linux Ubuntu Ubuntu-14.04"
+ - NODE_LABELS="Linux Ubuntu Ubuntu-16.04"
- os: osx
+ osx_image: xcode10.1
env:
- CXX=clang++
- - NODE_LABELS="OSX OSX-10.9"
+ - xcode10.1
+ - NODE_LABELS="OSX OSX_VERSION=10.13"
notifications:
email:
on_success: always
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 153ffed..8bdfd9f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -30,7 +30,7 @@
'sphinx.ext.mathjax',
'sphinxcontrib.doxylink',
'sphinxcontrib.aafig',
- # 'sphinxcontrib.googleanalytics',
+ 'sphinxcontrib.googleanalytics',
'sphinxcontrib.bibtex',
'redmine_issue'
]
diff --git a/docs/source/getting-started.rst b/docs/source/getting-started.rst
index 07f295a..aa25b5e 100644
--- a/docs/source/getting-started.rst
+++ b/docs/source/getting-started.rst
@@ -4,16 +4,15 @@
Portability
------------
-.. image:: https://travis-ci.org/named-data-ndnSIM/ndnSIM.svg?branch=test-travis-ci
+.. image:: https://travis-ci.org/named-data-ndnSIM/ndnSIM.svg?branch=master
:target: https://travis-ci.org/named-data-ndnSIM/ndnSIM
ndnSIM 2.x has been successfully compiled and used on following platforms:
-- Ubuntu Linux 16.04 (32- and 64-bit platform)
-- Ubuntu Linux 17.10 (64-bit platform)
-- macOS 10.11
-- macOS 10.12
+- Ubuntu Linux 18.04
+- Ubuntu Linux 16.04
- macOS 10.13
+- macOS 10.14
.. _requirements:
@@ -22,7 +21,7 @@
**1. Core dependencies**
-- ``python`` >= 2.6
+- ``python`` >= 2.7
- ``libsqlite3``
- ``pkg-config``
- ``openssl``
@@ -92,9 +91,8 @@
.. code-block:: bash
- sudo apt install python-dev python-pygraphviz python-kiwi python-pygoocanvas python-gnome2 python-rsvg ipython libcairo2-dev python3-gi libgirepository1.0-dev python-gi python-gi-cairo gir1.2-gtk-3.0 gir1.2-goocanvas-2.0
- sudo easy_install pip
- pip install pygraphviz pycairo PyGObject pygccxml
+ sudo apt install python-dev python-pygraphviz python-kiwi python-gnome2 ipython libcairo2-dev python3-gi libgirepository1.0-dev python-gi python-gi-cairo gir1.2-gtk-3.0 gir1.2-goocanvas-2.0 python-pip
+ sudo pip install pygraphviz pycairo PyGObject pygccxml
.. _visualizer: https://www.nsnam.org/wiki/PyViz