build: require gcc >= 5.3 and switch to C++14
Change-Id: I93c8fc238cc2654346bbc69a9d8ea83d1c0b099e
Refs: #3076, #4462
diff --git a/.jenkins.d/README.md b/.jenkins.d/README.md
index 41812aa..39fa40b 100644
--- a/.jenkins.d/README.md
+++ b/.jenkins.d/README.md
@@ -13,13 +13,13 @@
* `[OS_TYPE]`: `Linux`
* `[DISTRO_TYPE]`: `Ubuntu`
- * `[DISTRO_VERSION]`: `Ubuntu-14.04`, `Ubuntu-16.04`
+ * `[DISTRO_VERSION]`: `Ubuntu-16.04`, `Ubuntu-18.04`
Possible values for OS X / macOS:
* `[OS_TYPE]`: `OSX`
* `[DISTRO_TYPE]`: `OSX` (can be absent)
- * `[DISTRO_VERSION]`: `OSX-10.10`, `OSX-10.11`, `OSX-10.12`
+ * `[DISTRO_VERSION]`: `OSX-10.11`, `OSX-10.12`, `OSX-10.13`
- `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/.travis.yml b/.travis.yml
index 0db4659..984e8ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
language: cpp
-dist: trusty
+dist: xenial
sudo: required
env:
global:
@@ -11,77 +11,37 @@
# Linux/gcc
# https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test/+packages
- os: linux
- env: COMPILER=g++-4.8
- - os: linux
- env: COMPILER=g++-4.9
- addons:
- apt:
- sources: ubuntu-toolchain-r-test
- packages: g++-4.9
- - os: linux
env: COMPILER=g++-5
- addons:
- apt:
- sources: ubuntu-toolchain-r-test
- packages: g++-5
- os: linux
env: COMPILER=g++-6
- addons:
- apt:
- sources: ubuntu-toolchain-r-test
- packages: g++-6
- os: linux
env: COMPILER=g++-7
- addons:
- apt:
- sources: ubuntu-toolchain-r-test
- packages: g++-7
+ - os: linux
+ env: COMPILER=g++-8
# Linux/clang
# https://apt.llvm.org/
- os: linux
env: COMPILER=clang++-3.5
- addons:
- apt:
- packages: clang-3.5
- os: linux
env: COMPILER=clang++-3.6
- addons:
- apt:
- packages: clang-3.6
- os: linux
env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
- addons:
- apt:
- sources: ["llvm-toolchain-precise-3.7", "ubuntu-toolchain-r-test"]
- packages: clang-3.7
- os: linux
env: COMPILER=clang++-3.8
- addons:
- apt:
- sources: ["llvm-toolchain-precise-3.8", "ubuntu-toolchain-r-test"]
- packages: clang-3.8
- os: linux
- env: COMPILER=clang++-3.9 DISABLE_ASAN=yes
- addons:
- apt:
- sources: ["llvm-toolchain-trusty-3.9", "ubuntu-toolchain-r-test"]
- packages: clang-3.9
+ env: COMPILER=clang++-3.9
- os: linux
env: COMPILER=clang++-4.0
- addons:
- apt:
- sources: ["llvm-toolchain-trusty-4.0", "ubuntu-toolchain-r-test"]
- packages: clang-4.0
- os: linux
env: COMPILER=clang++-5.0
- addons:
- apt:
- sources: ["llvm-toolchain-trusty-5.0", "ubuntu-toolchain-r-test"]
- packages: clang-5.0
+ - os: linux
+ env: COMPILER=clang++-6.0
+ - os: linux
+ env: COMPILER=clang++-7
# macOS/clang
- # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version
+ # https://docs.travis-ci.com/user/reference/osx/#OS-X-Version
- os: osx
osx_image: xcode7.3
env: OSX_VERSION=10.11
@@ -89,11 +49,45 @@
osx_image: xcode8.3
env: OSX_VERSION=10.12
- os: osx
- osx_image: xcode9.2
- env: OSX_VERSION=10.12
+ osx_image: xcode9.3
+ env: OSX_VERSION=10.13
+
+ allow_failures:
+ - env: COMPILER=g++-6
+ - env: COMPILER=g++-7
+ - env: COMPILER=g++-8
+ - env: COMPILER=clang++-3.5
+ - env: COMPILER=clang++-3.6
+ - env: COMPILER=clang++-3.7 DISABLE_ASAN=yes
+ - env: COMPILER=clang++-3.8
+ - env: COMPILER=clang++-3.9
+ - env: COMPILER=clang++-4.0
+ - env: COMPILER=clang++-5.0
+ - env: COMPILER=clang++-6.0
+ - env: COMPILER=clang++-7
+
+ fast_finish: true
+
+install: |
+ case ${COMPILER} in
+ g++-[6789])
+ travis_retry sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+ travis_retry sudo apt-get -qq update
+ travis_retry sudo apt-get -qy install "${COMPILER}"
+ ;;
+ clang++-*)
+ CLANG_VERSION=${COMPILER/clang++}
+ if [[ ${CLANG_VERSION} != "-3."* ]]; then
+ wget -O - "https://apt.llvm.org/llvm-snapshot.gpg.key" | sudo apt-key add -
+ travis_retry sudo add-apt-repository -y "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial${CLANG_VERSION/-7} main"
+ fi
+ travis_retry sudo apt-get -qq update
+ travis_retry sudo apt-get -qy install "clang${CLANG_VERSION}"
+ ;;
+ esac
before_script:
- - if [[ ${TRAVIS_OS_NAME} == linux ]]; then export NODE_LABELS="Linux Ubuntu Ubuntu-14.04"; fi
+ - if [[ ${TRAVIS_OS_NAME} == linux ]]; then export NODE_LABELS="Linux Ubuntu Ubuntu-16.04"; fi
- if [[ ${TRAVIS_OS_NAME} == osx ]]; then export NODE_LABELS="OSX OSX-${OSX_VERSION}"; fi
- if [[ -n ${COMPILER} ]]; then export CXX=${COMPILER}; fi
- ${CXX:-c++} --version
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 54db7ea..e690290 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -15,14 +15,14 @@
errmsg = ''
warnmsg = ''
if cxx == 'gcc':
- if ccver < (4, 8, 2):
+ if ccver < (5, 3, 0):
errmsg = ('The version of gcc you are using is too old.\n'
- 'The minimum supported gcc version is 4.8.2.')
+ 'The minimum supported gcc version is 5.3.0.')
conf.flags = GccFlags()
elif cxx == 'clang':
- if ccver < (3, 4, 0):
+ if ccver < (3, 5, 0):
errmsg = ('The version of clang you are using is too old.\n'
- 'The minimum supported clang version is 3.4.0.')
+ 'The minimum supported clang version is 3.5.0.')
conf.flags = ClangFlags()
else:
warnmsg = 'Note: %s compiler is unsupported' % cxx
@@ -39,7 +39,7 @@
conf.areCustomCxxflagsPresent = (len(conf.env.CXXFLAGS) > 0)
- # General flags are always applied (e.g., selecting C++11 mode)
+ # General flags are always applied (e.g., selecting C++ language standard)
generalFlags = conf.flags.getGeneralFlags(conf)
conf.add_supported_cxxflags(generalFlags['CXXFLAGS'])
conf.add_supported_linkflags(generalFlags['LINKFLAGS'])
@@ -128,7 +128,7 @@
"""
def getGeneralFlags(self, conf):
flags = super(GccBasicFlags, self).getGeneralFlags(conf)
- flags['CXXFLAGS'] += ['-std=c++11']
+ flags['CXXFLAGS'] += ['-std=c++14']
return flags
def getDebugFlags(self, conf):
@@ -164,16 +164,12 @@
class GccFlags(GccBasicFlags):
def getDebugFlags(self, conf):
flags = super(GccFlags, self).getDebugFlags(conf)
- if self.getCompilerVersion(conf) < (5, 1, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
- flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
+ flags['CXXFLAGS'] += ['-fdiagnostics-color']
return flags
def getOptimizedFlags(self, conf):
flags = super(GccFlags, self).getOptimizedFlags(conf)
- if self.getCompilerVersion(conf) < (5, 1, 0):
- flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
- flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
+ flags['CXXFLAGS'] += ['-fdiagnostics-color']
return flags
class ClangFlags(GccBasicFlags):
diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index 7703505..308a15d 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -45,7 +45,7 @@
SyncLogicHandler::SyncLogicHandler(ndn::Face& face, const IsLsaNew& isLsaNew,
const ConfParameter& conf)
- : onNewLsa(ndn::make_unique<OnNewLsa>())
+ : onNewLsa(std::make_unique<OnNewLsa>())
, m_syncFace(face)
, m_isLsaNew(isLsaNew)
, m_confParam(conf)
diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 3c3fab3..58d4441 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -62,7 +62,7 @@
m_nlsrFace,
m_keyChain)
, m_helloProtocol(*this, scheduler)
- , m_validator(ndn::make_unique<ndn::security::v2::CertificateFetcherDirectFetch>(m_nlsrFace))
+ , m_validator(std::make_unique<ndn::security::v2::CertificateFetcherDirectFetch>(m_nlsrFace))
, m_controller(m_nlsrFace, m_keyChain)
, m_faceDatasetController(m_nlsrFace, m_keyChain)
, m_prefixUpdateProcessor(m_dispatcher,
diff --git a/src/route/routing-table.cpp b/src/route/routing-table.cpp
index 1f88c87..9c4ea77 100644
--- a/src/route/routing-table.cpp
+++ b/src/route/routing-table.cpp
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License along with
* NLSR, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
**/
+
#include "routing-table.hpp"
#include "nlsr.hpp"
#include "map.hpp"
@@ -35,7 +36,7 @@
INIT_LOGGER(route.RoutingTable);
RoutingTable::RoutingTable(ndn::Scheduler& scheduler)
- : afterRoutingChange{ndn::make_unique<AfterRoutingChange>()}
+ : afterRoutingChange{std::make_unique<AfterRoutingChange>()}
, m_scheduler(scheduler)
, m_NO_NEXT_HOP{-12345}
, m_routingCalcInterval{static_cast<uint32_t>(ROUTING_CALC_INTERVAL_DEFAULT)}
diff --git a/src/update/prefix-update-processor.cpp b/src/update/prefix-update-processor.cpp
index 26adefd..57bb579 100644
--- a/src/update/prefix-update-processor.cpp
+++ b/src/update/prefix-update-processor.cpp
@@ -54,8 +54,7 @@
NamePrefixList& namePrefixList,
Lsdb& lsdb)
: CommandManagerBase(dispatcher, namePrefixList, lsdb, "prefix-update")
-
- , m_validator(ndn::make_unique<ndn::security::v2::CertificateFetcherDirectFetch>(face))
+ , m_validator(std::make_unique<ndn::security::v2::CertificateFetcherDirectFetch>(face))
{
NLSR_LOG_DEBUG("Setting dispatcher to capture Interests for: "
<< ndn::Name(Nlsr::LOCALHOST_PREFIX).append("prefix-update"));
diff --git a/wscript b/wscript
index 809f5c6..5b9b8f8 100644
--- a/wscript
+++ b/wscript
@@ -185,7 +185,7 @@
else:
# no tags matched
Context.g_module.VERSION = '%s-commit-%s' % (VERSION_BASE, out)
- except subprocess.CalledProcessError:
+ except (OSError, subprocess.CalledProcessError):
pass
versionFile = ctx.path.find_node('VERSION')