Skip to content

Commit

Permalink
Release 2025-01-28
Browse files Browse the repository at this point in the history
  • Loading branch information
@arobenko
arobenko committed Jan 27, 2025
2 parents d009f84 + 79f917b commit b3468dc
Show file tree
Hide file tree
Showing 1,267 changed files with 5,203 additions and 2,792 deletions.
26 changes: 15 additions & 11 deletions .github/workflows/actions_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ name: Github Actions Build
on: [push]

env:
COMMS_TAG: v5.2.7
COMMSDSL_TAG: v6.3.4
COMMS_TAG: v5.3
COMMSDSL_TAG: v7.0.2
WIN_BOOST_VERSION: "1.87.0"
WIN_BOOST_DIR: "C:/local/boost_1_87_0"

jobs:

Expand Down Expand Up @@ -473,8 +475,8 @@ jobs:
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
arch: [Win32, x64]
type: [Debug, Release]
arch: [x64]
cpp: [11, 14, 17]

steps:
Expand All @@ -486,7 +488,8 @@ jobs:
- name: Install Boost
shell: cmd
run: |
choco install boost-msvc-14.2
choco install boost-msvc-14.2 --version=${{env.WIN_BOOST_VERSION}}
echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.2/cmake >>%GITHUB_ENV%
- name: Prepare externals
shell: cmd
Expand All @@ -508,8 +511,8 @@ jobs:
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_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON
- name: Build Target
Expand All @@ -524,7 +527,7 @@ jobs:
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
arch: [x64]
cpp: [11, 14, 17, 20]

Expand All @@ -538,7 +541,8 @@ jobs:
if: matrix.arch == 'x64'
shell: cmd
run: |
choco install boost-msvc-14.3 --version=1.85.0
choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}
echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%
- name: Prepare externals
shell: cmd
Expand All @@ -560,8 +564,8 @@ jobs:
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_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.BOOST_DIR}}" ^
-DCMAKE_POLICY_DEFAULT_CMP0167=NEW ^
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DOPT_FORCE_EXTRA_BOOST_LIBS=ON
- name: Build Target
Expand Down
17 changes: 4 additions & 13 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ option (OPT_USE_SANITIZERS "Compile with sanitizers." OFF)

#####################################################

set (MIN_COMMSDSL_VERSION "6.3.4")
set (MIN_COMMSDSL_VERSION "7.0.2")

if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -97,23 +97,14 @@ function (dsl_parse type name)
string(REPLACE ";" "\n" schema_files "${DSL_PARSE_SCHEMAS}")
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt "${schema_files}")

add_custom_target(${name}_prot_rm
COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir}
)

add_custom_command(
OUTPUT ${output_dir}
DEPENDS ${DSL_PARSE_SCHEMAS} ${src_files} ${name}_prot_rm
add_custom_target(${name}_dsl ALL
COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir}
COMMAND ${COMMSDSL2COMMS} --warn-as-err ${multi_schema_param} ${code_input_param} "--comms-tag=${CC_COMMS_TAG}"
-o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt
)

add_custom_target(${name}_dsl ALL
-o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt
COMMAND ${CMAKE_COMMAND}
-DGENERATED="${output_dir}/include" -DOUTPUT="${PROJECT_SOURCE_DIR}/${type}/${name}/include"
-P "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake"
DEPENDS ${name}_prot_rm ${output_dir} "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files}
DEPENDS "${PROJECT_SOURCE_DIR}/CopyGenerated.cmake" ${DSL_PARSE_SCHEMAS} ${src_files}
)

endfunction ()
Expand Down
8 changes: 5 additions & 3 deletions howtos/howto1/include/howto1/Interface.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of <b>"Interface"</b> interface class.
Expand All @@ -24,12 +24,14 @@ struct InterfaceFields
/// @brief Definition of <b>"Flags"</b> field.
class Flags : public
howto1::field::InterfaceFlags<
howto1::options::DefaultOptions
howto1::options::DefaultOptions,
comms::option::def::HasName
>
{
using Base =
howto1::field::InterfaceFlags<
howto1::options::DefaultOptions
howto1::options::DefaultOptions,
comms::option::def::HasName
>;
public:
/// @brief Name of the field.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/InterfaceCommon.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains common template parameters independent functionality of
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/MsgId.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of message ids enumeration.
Expand Down
4 changes: 2 additions & 2 deletions howtos/howto1/include/howto1/Version.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains protocol version definition.
Expand All @@ -22,5 +22,5 @@ inline constexpr unsigned specVersion()
} // namespace howto1

// Generated compile time check for minimal supported version of the COMMS library
static_assert(COMMS_MAKE_VERSION(5, 2, 7) <= comms::version(),
static_assert(COMMS_MAKE_VERSION(5, 3, 0) <= comms::version(),
"The version of COMMS library is too old");
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains dispatch to handling function(s) for client input input messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/dispatch/DispatchMessage.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains dispatch to handling function(s) for all input messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains dispatch to handling function(s) for client input input messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/factory/AllMessagesDynMemMsgFactory.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains message factory with dynamic memory allocation for all the messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/factory/ClientInputMessagesDynMemMsgFactory.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains message factory with dynamic memory allocation for the client input messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/factory/ServerInputMessagesDynMemMsgFactory.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains message factory with dynamic memory allocation for the server input messages.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/field/FieldBase.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of base class of all the fields.
Expand Down
15 changes: 11 additions & 4 deletions howtos/howto1/include/howto1/field/InterfaceFlags.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of <b>"InterfaceFlags"</b> field.
Expand All @@ -25,6 +25,7 @@ class InterfaceFlags : public
comms::field::BitmaskValue<
howto1::field::FieldBase<>,
TExtraOpts...,
comms::option::def::HasName,
comms::option::def::FixedLength<1U>,
comms::option::def::BitmaskReservedBits<0xFCU, 0x0U>
>
Expand All @@ -33,6 +34,7 @@ class InterfaceFlags : public
comms::field::BitmaskValue<
howto1::field::FieldBase<>,
TExtraOpts...,
comms::option::def::HasName,
comms::option::def::FixedLength<1U>,
comms::option::def::BitmaskReservedBits<0xFCU, 0x0U>
>;
Expand All @@ -50,13 +52,18 @@ class InterfaceFlags : public
B1
);

/// @brief Retrieve name of the bit.
/// @see @ref howto1::field::InterfaceFlagsCommon::bitName().
static const char* bitName(std::size_t idx)
{
return howto1::field::InterfaceFlagsCommon::bitName(idx);
}

/// @brief Retrieve name of the bit.
/// @see @ref howto1::field::InterfaceFlagsCommon::bitName().
static const char* bitName(BitIdx idx)
{
return
howto1::field::InterfaceFlagsCommon::bitName(
static_cast<std::size_t>(idx));
return bitName(static_cast<std::size_t>(idx));
}

/// @brief Name of the field.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/field/InterfaceFlagsCommon.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains common template parameters independent functionality of
Expand Down
4 changes: 3 additions & 1 deletion howtos/howto1/include/howto1/field/MsgId.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of <b>"MsgId"</b> field.
Expand Down Expand Up @@ -27,6 +27,7 @@ class MsgId : public
howto1::field::FieldBase<>,
howto1::field::MsgIdCommon::ValueType,
TExtraOpts...,
comms::option::def::HasName,
comms::option::def::ValidNumValueRange<1, 2>
>
{
Expand All @@ -35,6 +36,7 @@ class MsgId : public
howto1::field::FieldBase<>,
howto1::field::MsgIdCommon::ValueType,
TExtraOpts...,
comms::option::def::HasName,
comms::option::def::ValidNumValueRange<1, 2>
>;
public:
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/field/MsgIdCommon.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains common template parameters independent functionality of
Expand Down
30 changes: 28 additions & 2 deletions howtos/howto1/include/howto1/frame/Frame.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of <b>"Frame"</b> frame class.
Expand Down Expand Up @@ -34,10 +34,30 @@ namespace frame
template <typename TOpt = howto1::options::DefaultOptions>
struct FrameLayers
{
/// @brief Scope for field(s) of @ref Data layer.
struct DataMembers
{
/// @brief Custom field for @ref howto1::frame::FrameLayers::Data layer
class Field : public
comms::field::ArrayList<
howto1::field::FieldBase<>,
std::uint8_t,
typename TOpt::frame::FrameLayers::DataMembers::Field,
comms::option::def::HasName
>
{
public:
static const char* name()
{
return "Data";
}
};
};

/// @brief Definition of layer "Data".
using Data =
comms::protocol::MsgDataLayer<
typename TOpt::frame::FrameLayers::Data
comms::option::def::FieldType<typename DataMembers::Field>
>;

/// @brief Definition of layer "Flags".
Expand Down Expand Up @@ -77,13 +97,15 @@ struct FrameLayers
comms::field::IntValue<
howto1::field::FieldBase<>,
std::uint16_t,
comms::option::def::HasName,
comms::option::def::FixedBitLength<12U>
>
{
using Base =
comms::field::IntValue<
howto1::field::FieldBase<>,
std::uint16_t,
comms::option::def::HasName,
comms::option::def::FixedBitLength<12U>
>;
public:
Expand All @@ -107,12 +129,14 @@ struct FrameLayers
class Flags : public
howto1::field::InterfaceFlags<
TOpt,
comms::option::def::HasName,
comms::option::def::FixedBitLength<4U>
>
{
using Base =
howto1::field::InterfaceFlags<
TOpt,
comms::option::def::HasName,
comms::option::def::FixedBitLength<4U>
>;
public:
Expand All @@ -136,13 +160,15 @@ struct FrameLayers
comms::field::Bitfield<
howto1::field::FieldBase<>,
typename FieldMembers::All,
comms::option::def::HasName,
comms::option::def::HasVersionDependentMembers<false>
>
{
using Base =
comms::field::Bitfield<
howto1::field::FieldBase<>,
typename FieldMembers::All,
comms::option::def::HasName,
comms::option::def::HasVersionDependentMembers<false>
>;
public:
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/frame/FrameCommon.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains common template parameters independent functionality of
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/input/AllMessages.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of the AllMessages messages bundle.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/input/ClientInputMessages.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of the ClientInputMessages messages bundle.
Expand Down
2 changes: 1 addition & 1 deletion howtos/howto1/include/howto1/input/ServerInputMessages.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated by commsdsl2comms v6.3.4
// Generated by commsdsl2comms v7.0.2

/// @file
/// @brief Contains definition of the ServerInputMessages messages bundle.
Expand Down
Loading

0 comments on commit b3468dc

Please sign in to comment.