ci: speed up code-coverage jobs
Plus some documentation updates
Change-Id: I6fd2b04e22bca6c3d6e36e78d1995220e261206b
Refs: #3809
diff --git a/docs/INSTALL.rst b/docs/INSTALL.rst
index d3cef22..99f02df 100644
--- a/docs/INSTALL.rst
+++ b/docs/INSTALL.rst
@@ -11,10 +11,10 @@
- Ubuntu 14.04 (64-bit and 32-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
+- macOS 10.12
ndn-cxx is known to work on the following platforms, although they are not officially
supported:
@@ -34,15 +34,15 @@
- ``python`` >= 2.6
- ``libsqlite3``
- ``libcrypto++``
-- OpenSSL version >= 1.0
+- OpenSSL >= 1.0.1
- ``pkg-config``
- Boost libraries >= 1.54
-- OSX Security framework (on OSX platform only)
+- OSX Security framework (on OSX/macOS platform only)
Following are the detailed steps for each platform to install the compiler, all necessary
development tools and libraries, and ndn-cxx prerequisites.
-- OS X
+- OS X / macOS
Install Xcode from AppStore or at least Command Line Tools (``xcode-select --install``)
@@ -57,11 +57,10 @@
In a terminal, enter::
brew install boost pkg-config cryptopp openssl
- brew link --force openssl
.. note::
- If a major OS X system upgrade is performed after installing dependencies with
+ If a major OS upgrade is performed after installing dependencies with
MacPorts or Homebrew, remember to reinstall all packages.
- Ubuntu
@@ -90,7 +89,7 @@
The following lists steps for common platforms to install these prerequisites:
-- On OS X with MacPorts::
+- On OS X / macOS with MacPorts::
sudo port install doxygen graphviz py27-sphinx sphinx_select
sudo port select sphinx py27-sphinx
@@ -323,10 +322,10 @@
Customize Compiler
------------------
-To customize compiler, set ``CXX`` environment variable to point to compiler binary and, in
-some case, specify type of the compiler using ``--check-cxx-compiler``. For example, when
-using clang compiler on Linux system, use the following:
+To choose a custom C++ compiler for building ndn-cxx, set ``CXX`` environment
+variable to point to the compiler binary. For example, to build with clang on
+Linux, use the following:
::
- CXX=clang++ ./waf configure --check-cxx-compiler=clang++
+ CXX=clang++ ./waf configure
diff --git a/docs/README.rst b/docs/README.rst
index c1e0bba..b58f125 100644
--- a/docs/README.rst
+++ b/docs/README.rst
@@ -19,4 +19,4 @@
NDN <https://github.com/named-data/ndn-traffic-generator>`__
Please submit any bugs or issues to the `ndn-cxx issue tracker
-<http://redmine.named-data.net/projects/ndn-cxx/issues>`__.
+<https://redmine.named-data.net/projects/ndn-cxx/issues>`__.
diff --git a/docs/conf.py b/docs/conf.py
index d0d0818..dbcdd3b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -274,4 +274,4 @@
# exclude_patterns = ['RELEASE_NOTES.rst']
-redmine_project_url = "http://redmine.named-data.net/"
+redmine_project_url = "https://redmine.named-data.net/"
diff --git a/docs/index.rst b/docs/index.rst
index 291fb72..f73ad84 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,7 +5,7 @@
used to implement various NDN applications.
Please submit any bugs or issues to the `ndn-cxx issue tracker
-<http://redmine.named-data.net/projects/ndn-cxx/issues>`__.
+<https://redmine.named-data.net/projects/ndn-cxx/issues>`__.
ndn-cxx Documentation
---------------------
diff --git a/docs/tutorials/security-validator-config.rst b/docs/tutorials/security-validator-config.rst
index aec8d7d..9df0020 100644
--- a/docs/tutorials/security-validator-config.rst
+++ b/docs/tutorials/security-validator-config.rst
@@ -578,7 +578,7 @@
Example Configuration For NFD RIB Management
--------------------------------------------
-Assume `NFD RIB Management <http://redmine.named-data.net/projects/nfd/wiki/RibMgmt>`_
+Assume `NFD RIB Management <https://redmine.named-data.net/projects/nfd/wiki/RibMgmt>`_
allows any valid testbed certificate to register prefix, the configuration file could be
written as: