build: bump ndn-cxx dependency
Change-Id: Ieb71a4f72bb59e4df08113743d27f5d3c299af44
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b551e45..f328d39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@
- os: macos-12
xcode: '13.4'
- os: macos-12
- xcode: '14.1'
+ xcode: '14.2'
steps:
- name: Set up Xcode
uses: maxim-lobanov/setup-xcode@v1
diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 9b1e073..c114f8d 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -21,7 +21,7 @@
if [[ $ID == macos ]]; then
if [[ -n $GITHUB_ACTIONS ]]; then
- export HOMEBREW_NO_INSTALL_UPGRADE=1
+ export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
fi
brew update
brew install --formula "${FORMULAE[@]}"
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index 4debb4e..3a7bf66 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -145,9 +145,9 @@
flags = super(GccBasicFlags, self).getDebugFlags(conf)
flags['CXXFLAGS'] += ['-Og',
'-g3',
- '-pedantic',
'-Wall',
'-Wextra',
+ '-Wpedantic',
'-Werror',
'-Wcatch-value=2',
'-Wextra-semi',
@@ -163,9 +163,9 @@
flags = super(GccBasicFlags, self).getOptimizedFlags(conf)
flags['CXXFLAGS'] += ['-O2',
'-g',
- '-pedantic',
'-Wall',
'-Wextra',
+ '-Wpedantic',
'-Wcatch-value=2',
'-Wextra-semi',
'-Wnon-virtual-dtor',
diff --git a/AUTHORS.md b/AUTHORS.md
index b80927a..a7af4a4 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,8 +1,8 @@
# NAC Authors
-The following lists maintainers, primary developers, and all much-appreciated contributors to NAC in alphabetic order.
+The following lists maintainers, primary developers, and all much-appreciated contributors to NAC in alphabetical order.
The specific contributions of individual authors can be obtained from the git history of the [official NAC repository](https://github.com/named-data/name-based-access-control).
-If you would like to become a contributor to the official repository, please follow the recommendations in https://github.com/named-data/.github/blob/master/CONTRIBUTING.md.
+If you would like to become a contributor to the official repository, please follow the recommendations in <https://github.com/named-data/.github/blob/master/CONTRIBUTING.md>.
* ***(Maintainer)*** Alexander Afanaysev <https://users.cs.fiu.edu/~afanasyev>
* Ashlesh Gawande <https://www.linkedin.com/in/agawande>
diff --git a/docs/conf.py b/docs/conf.py
index 227ef4e..a2f3622 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,7 +10,7 @@
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
project = 'NAC: Name-based Access Control library'
-copyright = 'Copyright © 2014-2022 Regents of the University of California.'
+copyright = 'Copyright © 2014-2023 Regents of the University of California.'
author = 'Named Data Networking Project'
# The short X.Y version.
diff --git a/docs/index.rst b/docs/index.rst
index 3a40dfc..9886f33 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,6 +1,12 @@
NAC: Name-Based Access Control
==============================
+.. toctree::
+ :hidden:
+ :maxdepth: 3
+
+ spec
+
NAC is a C++ library providing Name-Based Access control primitives that
can be used to implement content confidentiality in NDN applications.
@@ -10,17 +16,11 @@
Documentation
-------------
-.. toctree::
- :hidden:
- :maxdepth: 3
-
- spec
-
- :doc:`spec`
-- `API documentation (doxygen) <doxygen/annotated.html>`_
+- `API documentation (doxygen) <doxygen/annotated.html>`__
License
-------
NAC is an open source project licensed under the LGPL version 3. For more information about
-the license, refer to `COPYING.md <https://github.com/named-data/name-based-access-control/blob/new/COPYING.md>`_.
+the license, refer to `COPYING.md <https://github.com/named-data/name-based-access-control/blob/new/COPYING.md>`__.
diff --git a/wscript b/wscript
index b83b008..f4f1e70 100644
--- a/wscript
+++ b/wscript
@@ -36,7 +36,7 @@
conf.find_program(['pkgconf', 'pkg-config'], var='PKGCONFIG')
pkg_config_path = os.environ.get('PKG_CONFIG_PATH', f'{conf.env.LIBDIR}/pkgconfig')
- conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.0', '--cflags', '--libs'],
+ conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.1', '--cflags', '--libs'],
uselib_store='NDN_CXX', pkg_config_path=pkg_config_path)
boost_libs = ['system', 'program_options']