Skip to content

Commit e8c3f16

Browse files
committed
Prepare release NLSR 24.08
Refs: #5327 Change-Id: Iea5e29f8716df1377a4207a678af176622eaa445
1 parent bcd7683 commit e8c3f16

File tree

6 files changed

+69
-34
lines changed

6 files changed

+69
-34
lines changed

docs/release-notes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Release Notes
22
=============
33

4-
.. include:: release-notes/release-notes-0.7.0.rst
4+
.. include:: release-notes/release-notes-24.08.rst
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
NLSR version 24.08
2+
------------------
3+
4+
*Release date: August 12, 2024*
5+
6+
Notable changes
7+
^^^^^^^^^^^^^^^
8+
9+
- We have moved over to the `CalVer <https://calver.org/>`__ versioning scheme to maintain
10+
consistency with NFD going forward: 24.08 is the successor to 0.7.0
11+
12+
- The minimum build requirements have been increased as follows:
13+
14+
- GCC >= 9.3 or Clang >= 7.0 are strongly *recommended* on Linux; GCC 8.x is also known
15+
to work but is not officially supported
16+
- Xcode 13 or later is *recommended* on macOS; older versions may still work but are not
17+
officially supported
18+
- Boost >= 1.71.0 and ndn-cxx >= 0.9.0 are *required* on all platforms
19+
20+
- Added Dockerfile for NLSR. A prebuilt image for *linux/amd64* and *linux/arm64* platforms
21+
is available on the `GitHub container registry <https://github.com/named-data/NLSR/pkgs/container/nlsr>`__
22+
23+
Improvements
24+
^^^^^^^^^^^^
25+
26+
- Defined equality operator for LSA classes and simplified LSA-related code in
27+
:nlsr:`NamePrefixList` (:issue:`4094`)
28+
- Standardized on ``operator<<`` in LSA classes for printing rather than ``toString`` (:issue:`5308`)
29+
- Introduced use of Boost ``bimap`` and ``multi_array`` classes to simplify implementation of
30+
:nlsr:`NameMap` and link-state calculations for :nlsr:`RoutingTable` respectively (:issue:`5308`)
31+
- Removed forward dependency on :nlsr:`ConfParameter` in :nlsr:`SyncLogicHandler` (:issue:`4208`)
32+
- Split routing calculator code from main class to separate files
33+
with shared header to allow for transparent changes to routing code
34+
- Additional miscellaneous refactoring
35+
- Update waf build system to version 2.0.27
36+
- Fix building the documentation with Python 3.12 (:issue:`5298`)
37+
- Various miscellaneous improvements to build and CI scripts
38+
39+
Bug fixes
40+
^^^^^^^^^
41+
42+
- Prevent crashes if received segment lacks KeyLocator when LSDB is trying
43+
to fetch a certificate
44+
- Prevent issues from dereferencing empty optional when link state calculator
45+
was passed a non-existent source node (:issue:`5308`)
46+
- Hello data freshness has been dropped to 0 seconds; this prevents issues where Hellos can
47+
be cached and cause delays in detecting link failures in certain cases (:issue:`5265`)
48+
- Removed dead links to tarballs in docs
49+
- Various adjustments to match ndn-cxx namespace changes

docs/releases.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ Release History
99

1010
release-notes/*
1111

12+
* **NLSR version 24.08**
13+
\| :doc:`Release Notes <release-notes/release-notes-24.08>`
14+
\| `GitHub <https://github.com/named-data/NLSR/releases/tag/NLSR-24.08>`__
15+
\| `Source download <https://github.com/named-data/NLSR/releases/download/NLSR-24.08/nlsr-24.08.tar.xz>`__
16+
(`checksum <https://github.com/named-data/NLSR/releases/download/NLSR-24.08/nlsr-24.08.tar.xz.sha256>`__)
17+
\| `Documentation <https://docs.named-data.net/NLSR/24.08/>`__
18+
1219
* **NLSR version 0.7.0**
1320
(:doc:`Release Notes <release-notes/release-notes-0.7.0>`,
1421
`GitHub <https://github.com/named-data/NLSR/releases/tag/NLSR-0.7.0>`__,

src/conf-parameter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ class ConfParameter
531531

532532
PUBLIC_WITH_TESTS_ELSE_PRIVATE:
533533
// must be incremented when breaking changes are made to sync
534-
static constexpr uint64_t SYNC_VERSION = 11;
534+
static constexpr uint64_t SYNC_VERSION = 12;
535535

536536
AdjacencyList m_adjl;
537537
NamePrefixList m_npl;

src/version.hpp.in

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,13 @@
2323

2424
namespace nlsr {
2525

26-
/** NLSR version follows Semantic Versioning 2.0.0 specification
27-
* http://semver.org/
28-
*/
26+
// NLSR version version follows Calendar Versioning (https://calver.org/)
27+
// based on the year and month of the release, followed by an optional "patch" number,
28+
// i.e., `YY.0M[.MICRO (integer without a leading zero)]` using CalVer notation.
2929

3030
// To change version number, modify VERSION variable in top-level wscript.
3131

32-
/** \brief NLSR version represented as an integer
33-
*
34-
* MAJOR*1000000 + MINOR*1000 + PATCH
35-
*/
36-
#define NLSR_VERSION @VERSION@
37-
38-
/** \brief NLSR version represented as a string
39-
*
40-
* MAJOR.MINOR.PATCH
32+
/** \brief NLSR version represented as a string in the CalVer format
4133
*/
4234
#define NLSR_VERSION_STRING "@VERSION_STRING@"
4335

@@ -51,19 +43,12 @@ namespace nlsr {
5143
*
5244
* When NLSR is built not from git, NLSR_VERSION_BUILD_STRING equals NLSR_VERSION_STRING
5345
*
54-
* MAJOR.MINOR.PATCH(-release-candidate-tag)(-(number-of-commits-since-tag)-COMMIT-HASH)
46+
* YY.0M[.MICRO](-release-candidate-tag)(-(number-of-commits-since-tag)-COMMIT-HASH)
5547
*
56-
* Example, 0.1.0-rc1-1-g5c86570
48+
* Example: 20.01.1-rc1-1-g5c86570
5749
*/
5850
#define NLSR_VERSION_BUILD_STRING "@VERSION_BUILD@"
5951

60-
/// MAJOR version
61-
#define NLSR_VERSION_MAJOR @VERSION_MAJOR@
62-
/// MINOR version
63-
#define NLSR_VERSION_MINOR @VERSION_MINOR@
64-
/// PATCH version
65-
#define NLSR_VERSION_PATCH @VERSION_PATCH@
66-
6752
} // namespace nlsr
6853

6954
#endif // NLSR_VERSION_HPP

wscript

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import os
2323
import subprocess
2424
from waflib import Context, Logs, Utils
2525

26-
VERSION = '0.7.0'
26+
VERSION = '24.08'
2727
APPNAME = 'nlsr'
2828
GIT_TAG_PREFIX = 'NLSR-'
2929

@@ -69,7 +69,7 @@ def configure(conf):
6969
conf.find_program(['pkgconf', 'pkg-config'], var='PKGCONFIG')
7070

7171
pkg_config_path = os.environ.get('PKG_CONFIG_PATH', f'{conf.env.LIBDIR}/pkgconfig')
72-
conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.8.1', '--cflags', '--libs'],
72+
conf.check_cfg(package='libndn-cxx', args=['libndn-cxx >= 0.9.0', '--cflags', '--libs'],
7373
uselib_store='NDN_CXX', pkg_config_path=pkg_config_path)
7474

7575
conf.check_boost(lib='filesystem', mt=True)
@@ -82,11 +82,11 @@ def configure(conf):
8282
conf.check_boost(lib='unit_test_framework', mt=True, uselib_store='BOOST_TESTS')
8383

8484
if conf.options.with_chronosync:
85-
conf.check_cfg(package='ChronoSync', args=['ChronoSync >= 0.5.5', '--cflags', '--libs'],
85+
conf.check_cfg(package='ChronoSync', args=['ChronoSync >= 0.5.6', '--cflags', '--libs'],
8686
uselib_store='CHRONOSYNC', pkg_config_path=pkg_config_path)
8787

8888
if conf.options.with_psync:
89-
conf.check_cfg(package='PSync', args=['PSync >= 0.4.0', '--cflags', '--libs'],
89+
conf.check_cfg(package='PSync', args=['PSync >= 0.5.0', '--cflags', '--libs'],
9090
uselib_store='PSYNC', pkg_config_path=pkg_config_path)
9191

9292
if conf.options.with_svs:
@@ -123,13 +123,7 @@ def build(bld):
123123
target='src/version.hpp',
124124
install_path=None,
125125
VERSION_STRING=VERSION_BASE,
126-
VERSION_BUILD=VERSION,
127-
VERSION=int(VERSION_SPLIT[0]) * 1000000 +
128-
int(VERSION_SPLIT[1]) * 1000 +
129-
int(VERSION_SPLIT[2]),
130-
VERSION_MAJOR=VERSION_SPLIT[0],
131-
VERSION_MINOR=VERSION_SPLIT[1],
132-
VERSION_PATCH=VERSION_SPLIT[2])
126+
VERSION_BUILD=VERSION)
133127

134128
bld.objects(
135129
target='nlsr-objects',

0 commit comments

Comments
 (0)