Skip to content

Commit

Permalink
Release v1.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
arobenko committed Apr 13, 2024
2 parents 026395c + 3121bea commit bcdd9ba
Show file tree
Hide file tree
Showing 78 changed files with 215 additions and 115 deletions.
12 changes: 6 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ configuration:
- Release

environment:
COMMS_BRANCH: v5.2.2
CC_MQTTSN_BRANCH: v2.6
CC_MQTT311_BRANCH: v2.6
COMMS_TAG: v5.2.3
CC_MQTTSN_TAG: v2.7
CC_MQTT311_TAG: v2.7

matrix:
- CPP_STD: 11
Expand All @@ -44,9 +44,9 @@ install:
- set PATH=%PATH%;%QTDIR%\bin
- set BUILD_DIR=%APPVEYOR_BUILD_FOLDER%\build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
- if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
- set COMMS_TAG=%COMMS_BRANCH%
- set CC_MQTTSN_TAG=%CC_MQTTSN_BRANCH%
- set CC_MQTT311_TAG=%CC_MQTT311_BRANCH%
- set COMMS_TAG=%COMMS_TAG%
- set CC_MQTTSN_TAG=%CC_MQTTSN_TAG%
- set CC_MQTT311_TAG=%CC_MQTT311_TAG%
- set COMMON_INSTALL_DIR=%BUILD_DIR%\install
- set COMMON_BUILD_TYPE=%CONFIGURATION%
- set COMMON_CXX_STANDARD=%CPP_STD%
Expand Down
147 changes: 124 additions & 23 deletions .github/workflows/actions_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Github Actions Build
on: [push]

env:
COMMS_BRANCH: v5.2.2
CC_MQTTSN_BRANCH: v2.6
CC_MQTT311_BRANCH: v2.6
COMMS_TAG: v5.2.3
CC_MQTTSN_TAG: v2.7
CC_MQTT311_TAG: v2.7

jobs:
build_gcc_old_ubuntu_20_04:
Expand All @@ -18,7 +18,7 @@ jobs:
cpp: [11, 14]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Add repositories
run: |
Expand All @@ -45,9 +45,9 @@ jobs:
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_BRANCH}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_BRANCH}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_BRANCH}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}

- name: Configure CMake
shell: bash
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
cpp: [11, 14, 17]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing
Expand All @@ -104,9 +104,9 @@ jobs:
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_BRANCH}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_BRANCH}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_BRANCH}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}

- name: Configure CMake
shell: bash
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
cpp: [11, 14, 17, 20]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing
Expand All @@ -163,9 +163,9 @@ jobs:
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_BRANCH}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_BRANCH}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_BRANCH}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}

- name: Configure CMake
shell: bash
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
cpp: [11, 14, 17, 20]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing
Expand All @@ -223,9 +223,9 @@ jobs:
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_BRANCH}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_BRANCH}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_BRANCH}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}

- name: Configure CMake
shell: bash
Expand Down Expand Up @@ -267,7 +267,7 @@ jobs:
cpp: 20

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing
Expand All @@ -289,9 +289,9 @@ jobs:
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_BRANCH}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_BRANCH}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_BRANCH}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}

- name: Configure CMake
shell: bash
Expand All @@ -316,3 +316,104 @@ jobs:
shell: bash
run: ctest -V

build_msvc_2019:
runs-on: windows-2019
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
arch: [Win32, x64]
cpp: [11, 14, 17]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Prepare externals
shell: cmd
run: |
%GITHUB_WORKSPACE%\script\prepare_externals.bat
env:
BUILD_DIR: ${{runner.workspace}}/build
PLATFORM: ${{matrix.arch}}
EXTERNALS_DIR: ${{runner.workspace}}/externals
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}

- name: Configure CMake
shell: cmd
working-directory: ${{runner.workspace}}/build
run: |
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
-DCC_MQTTSN_BUILD_UNIT_TESTS=ON ^
-DCC_MQTTSN_BUILD_CLIENT_APPS=OFF -DCC_MQTTSN_BUILD_GATEWAY_APPS=OFF
- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: cmd
run: cmake --build . --config ${{matrix.type}}
env:
VERBOSE: 1

- name: Testing
working-directory: ${{runner.workspace}}/build
shell: cmd
run: ctest -V

build_msvc_2022:
runs-on: windows-2022
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
arch: [Win32, x64]
cpp: [11, 14, 17, 20]

steps:
- uses: actions/checkout@v4

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Prepare externals
shell: cmd
run: |
%GITHUB_WORKSPACE%\script\prepare_externals.bat
env:
BUILD_DIR: ${{runner.workspace}}/build
PLATFORM: ${{matrix.arch}}
EXTERNALS_DIR: ${{runner.workspace}}/externals
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_MQTT311_TAG: ${{env.CC_MQTT311_TAG}}
CC_MQTTSN_TAG: ${{env.CC_MQTTSN_TAG}}

- name: Configure CMake
shell: cmd
working-directory: ${{runner.workspace}}/build
run: |
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
-DCC_MQTTSN_BUILD_UNIT_TESTS=ON ^
-DCC_MQTTSN_BUILD_CLIENT_APPS=OFF -DCC_MQTTSN_BUILD_GATEWAY_APPS=OFF
- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: cmd
run: cmake --build . --config ${{matrix.type}}
env:
VERBOSE: 1

- name: Testing
working-directory: ${{runner.workspace}}/build
shell: cmd
run: ctest -V
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.1)
project ("cc_mqttsn")
cmake_minimum_required (VERSION 3.10)
project ("cc_mqttsn_libs")

option (CC_MQTTSN_WARN_AS_ERR "Do NOT treat warning as error" ON)
option (CC_MQTTSN_CLIENT_DEFAULT_LIB "Build and install default variant of MQTT-SN Client library" ON)
Expand Down
4 changes: 2 additions & 2 deletions client/include/cc_mqttsn_client/common.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down Expand Up @@ -40,7 +40,7 @@ extern "C" {
#define CC_MQTTSN_CLIENT_MINOR_VERSION 0U

/// @brief Patch level of the library
#define CC_MQTTSN_CLIENT_PATCH_VERSION 7U
#define CC_MQTTSN_CLIENT_PATCH_VERSION 8U

/// @brief Macro to create numeric version as single unsigned number
#define CC_MQTTSN_CLIENT_MAKE_VERSION(major_, minor_, patch_) \
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pub/udp/Pub.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pub/udp/Pub.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/pub/udp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/sub/udp/Sub.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/sub/udp/Sub.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/sub/udp/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
4 changes: 2 additions & 2 deletions client/src/basic/BasicClient.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -24,7 +24,7 @@
#include "cc_mqttsn_client/common.h"
#include "details/WriteBufStorageType.h"

static_assert(COMMS_MAKE_VERSION(2, 6, 0) <= cc_mqttsn::version(),
static_assert(COMMS_MAKE_VERSION(2, 7, 0) <= cc_mqttsn::version(),
"The version of cc.mqttsn.generated library is too old");

namespace cc_mqttsn_client
Expand Down
2 changes: 1 addition & 1 deletion client/src/basic/ClientMgr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/basic/ParsedOptions.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/basic/details/OptionsParser.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/basic/details/WriteBufStorageType.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/src/basic/option.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/templ/client.cpp.templ
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/templ/client.h.templ
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/test/ClientBasic.th
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
2 changes: 1 addition & 1 deletion client/test/CommonTestClient.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// Copyright 2016 - 2023 (C). Alex Robenko. All rights reserved.
// Copyright 2016 - 2024 (C). Alex Robenko. All rights reserved.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
Loading

0 comments on commit bcdd9ba

Please sign in to comment.