Upgrade to NNG 2.0 for NanoRT

.github/workflows/coverage.yml

@@ -1,38 +1,37 @@
 name: coverage
 on: [push]
 jobs:
-
   linux-coverage:
     name: linux
-    runs-on: [ ubuntu-latest ]
+    runs-on: [ubuntu-latest]
     steps:
-    - name: Check out code
-      uses: actions/checkout@v1
+      - name: Check out code
+        uses: actions/checkout@v4
 
-    - name: Install mbedTLS
-      run: sudo apt-get install libmbedtls-dev
+      - name: Install mbedTLS
+        run: sudo apt-get install libmbedtls-dev
 
-    - name: Install ninja
-      run: sudo apt-get install ninja-build
+      - name: Install ninja
+        run: sudo apt-get install ninja-build
 
-    - name: Configure
-      run:  mkdir build && cd build && cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
+      - name: Configure
+        run: mkdir build && cd build && cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
 
-    - name: build
-      run: cd build && ninja
+      - name: build
+        run: cd build && ninja
 
-    - name: Test
-      run: cd build && ctest --output-on-failure
+      - name: Test
+        run: cd build && ctest --output-on-failure
 
-    - name: Upload report
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        yml: ./.codecov.yml
+      - name: Upload report
+        uses: codecov/codecov-action@v4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          codecov_yml_path: ./.codecov.yml
 
   darwin-coverage:
     name: darwin
-    runs-on: [ macos-latest ]
+    runs-on: [macos-latest]
     steps:
       - name: Check out code
         uses: actions/checkout@v1
@@ -44,7 +43,7 @@ jobs:
         run: brew install ninja
 
       - name: Configure
-        run:  mkdir build && cd build && cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
+        run: mkdir build && cd build && cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
 
       - name: build
         run: cd build && ninja
@@ -53,7 +52,7 @@ jobs:
         run: cd build && ctest --output-on-failure
 
       - name: Upload report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           yml: ./.codecov.yml

.github/workflows/darwin.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: [macos-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Install Mbed TLS
         run: brew install mbedtls

.github/workflows/linux.yml

@@ -1,25 +1,33 @@
 name: linux
 on: [push, pull_request]
 jobs:
-
   build:
+    strategy:
+      matrix:
+        tls:
+          - engine: mbed
+            pkg: libmbedtls-dev
+            dir: build.mbed
+          - engine: wolf
+            pkg: libwolfssl-dev
+            dir: build.wolf
     name: build
-    runs-on: [ ubuntu-latest ]
+    runs-on: [ubuntu-latest]
     steps:
-    - name: Check out code
-      uses: actions/checkout@v1
+      - name: Check out code
+        uses: actions/checkout@v4
 
-    - name: Install mbedTLS
-      run: sudo apt-get install libmbedtls-dev
+      - name: Install ninja
+        run: sudo apt-get install ninja-build
 
-    - name: Install ninja
-      run: sudo apt-get install ninja-build
+      - name: Install TLS engine
+        run: sudo apt-get install ${{ matrix.tls.pkg }}
 
-    - name: Configure
-      run: mkdir build && cd build && cmake -G Ninja -D NNG_ENABLE_TLS=ON ..
+      - name: Configure
+        run: mkdir ${{ matrix.tls.dir }} && cd ${{ matrix.tls.dir }} && cmake -G Ninja -D NNG_ENABLE_TLS=ON -DNNG_TLS_ENGINE=${{ matrix.tls.engine }} ..
 
-    - name: Build
-      run: cd build && ninja
+      - name: Build
+        run: cd ${{ matrix.tls.dir }} && ninja
 
-    - name: Test
-      run: cd build && ctest --output-on-failure
+      - name: Test
+        run: cd ${{ matrix.tls.dir }} && ctest --output-on-failure

.github/workflows/mdbook.yml

@@ -0,0 +1,36 @@
+name: mdbook
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v2
+        with:
+          # mdbook-version: '0.4.10'
+          mdbook-version: "latest"
+
+      - run: cargo install mdbook-alerts
+      - run: cargo install mdbook-indexing
+      - run: cargo install mdbook-footnote
+      - run: cargo install mdbook-pagetoc
+      - run: mdbook build -d ./book docs
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        if: ${{ github.ref == 'refs/heads/main' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs/book
+          destination_dir: ./ref
+          enable_jekyll: true

.github/workflows/windows.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: [windows-latest]
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: vcpkg build
         id: vcpkg

CMakeLists.txt

@@ -58,8 +58,10 @@ set(NNG_MINOR_VERSION ${CMAKE_MATCH_1})
 string(REGEX MATCH "NNG_PATCH_VERSION ([0-9]*)" _ ${nng_ver_h})
 set(NNG_PATCH_VERSION ${CMAKE_MATCH_1})
 string(REGEX MATCH "NNG_RELEASE_SUFFIX \"([a-z0-9]*)\"" _ ${nng_ver_h})
-if (NOT ("${CMAKE_MATCH_1}" STREQUAL ""))
-    set(NNG_PRERELEASE "-${CMAKE_MATCH_1}")
+set(NNG_DEV_VERSION ${CMAKE_MATCH_1})
+if (NNG_DEV_VERSION)
+    message(STATUS "This is a prelease.")
+    set(NNG_PRERELEASE "-${NNG_DEV_VERSION}")
 endif ()
 
 set(NNG_ABI_SOVERSION 1)
@@ -99,10 +101,6 @@ target_compile_definitions(nng_private INTERFACE NNG_PRIVATE)
 if (NNG_ELIDE_DEPRECATED)
     target_compile_definitions(nng PRIVATE NNG_ELIDE_DEPRECATED)
 endif()
-if (NNG_ENABLE_COMPAT)
-    target_compile_definitions(nng PRIVATE NNG_ENABLE_COMPAT)
-endif()
-
 
 # We can use rlimit to configure the stack size for systems
 # that have too small defaults.  This is not used for Windows,
@@ -180,7 +178,8 @@ endif ()
 include(CheckSanitizer)
 CheckSanitizer()
 if (NOT NNG_SANITIZER STREQUAL "none")
-    set(NNG_SANITIZER_FLAGS "-g -fsanitize=${NNG_SANITIZER}")
+    set(NNG_SANITIZER_FLAGS "-fsanitize=${NNG_SANITIZER}")
+    add_definitions(-DNNG_SANITIZER)
 endif ()
 
 
@@ -204,6 +203,7 @@ if (NNG_ENABLE_COVERAGE)
     else ()
         message(FATAL_ERROR "Unable to enable coverage for your compiler.")
     endif ()
+    add_definitions(-DNNG_CONVERAGE)
 endif ()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NNG_WARN_FLAGS} ${NNG_COVERAGE_C_FLAGS} ${NNG_SANITIZER_FLAGS}")

CODE_OF_CONDUCT.adoc → CODE_OF_CONDUCT.md

@@ -1,6 +1,6 @@
-= NNG Code of Conduct
+# NNG Code of Conduct
 
-== Our Pledge
+## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
 contributors and maintainers pledge to making participation in our project and
@@ -10,29 +10,29 @@ experience,
 nationality, personal appearance, race, religion, or sexual identity and
 orientation.
 
-== Our Standards
+## Our Standards
 
 Examples of behavior that contributes to creating a positive environment
 include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
+- The use of sexualized language or imagery and unwelcome sexual attention or
   advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
   address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-== Our Responsibilities
+## Our Responsibilities
 
 Project maintainers are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
@@ -44,7 +44,7 @@ that are not aligned to this Code of Conduct, or to ban temporarily or
 permanently any contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
-== Scope
+## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community. Examples of
@@ -53,7 +53,7 @@ address, posting via an official social media account, or acting as an appointed
 representative at an online or offline event. Representation of a project may be
 further defined and clarified by project maintainers.
 
-== Enforcement
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported by contacting the project team at [email protected]. All
@@ -67,8 +67,8 @@ Project maintainers who do not follow or enforce the Code of Conduct in good
 faith may face temporary or permanent repercussions as determined by other
 members of the project's leadership.
 
-== Attribution
+## Attribution
 
 This Code of Conduct is adapted from the
-https://www.contributor-convent.org[Contributor Covenant], version 1.4,
+[Contributor Covenant](https://www.contributor-convent.org), version 1.4,
 available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html