Skip to content

Commit 5cb413d

Browse files
committed
Release 2022-08-13.
2 parents 41a8f29 + a9bb76f commit 5cb413d

File tree

1,017 files changed

+9444
-1279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,017 files changed

+9444
-1279
lines changed

.github/workflows/actions_build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Build
3636
working-directory: ${{runner.workspace}}/build
3737
shell: bash
38-
run: cmake --build . --target install
38+
run: cmake --build . --config ${{matrix.type}} --target install
3939
env:
4040
VERBOSE: 1
4141

@@ -74,7 +74,7 @@ jobs:
7474
- name: Build
7575
working-directory: ${{runner.workspace}}/build
7676
shell: bash
77-
run: cmake --build . --target install
77+
run: cmake --build . --config ${{matrix.type}} --target install
7878
env:
7979
VERBOSE: 1
8080

@@ -113,7 +113,7 @@ jobs:
113113
- name: Build
114114
working-directory: ${{runner.workspace}}/build
115115
shell: bash
116-
run: cmake --build . --target install
116+
run: cmake --build . --config ${{matrix.type}} --target install
117117
env:
118118
VERBOSE: 1
119119

@@ -154,6 +154,6 @@ jobs:
154154
- name: Build
155155
working-directory: ${{runner.workspace}}/build
156156
shell: bash
157-
run: cmake --build . --target install
157+
run: cmake --build . --config ${{matrix.type}} --target install
158158
env:
159159
VERBOSE: 1

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ option (USE_SANITIZERS "Compile with sanitizers." OFF)
1616
# COMMSDSL_CXX_COMPILER - "C++" Compiler for commsdsl project
1717

1818
if ("${COMMSDSL_TAG}" STREQUAL "")
19-
set (COMMSDSL_TAG "v4.0")
19+
set (COMMSDSL_TAG "v5.0")
2020
endif ()
2121

2222
if ("${CC_COMMS_TAG}" STREQUAL "")
23-
set (CC_COMMS_TAG "v4.0")
23+
set (CC_COMMS_TAG "v5.0")
2424
endif ()
2525

2626
if (NOT CMAKE_CXX_STANDARD)
@@ -132,6 +132,7 @@ if ("${COMMSDSL2COMMS}" STREQUAL "")
132132
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${commsdsl2comms_install_dir}
133133
-DCOMMSDSL_NO_TESTS=ON -DCMAKE_C_COMPILER=${COMMSDSL_C_COMPILER}
134134
-DCMAKE_CXX_COMPILER=${COMMSDSL_CXX_COMPILER}
135+
-DCOMMSDSL_INSTALL_LIBRARY=OFF
135136
-DCOMMSDSL_EXTERNALS_DIR=${EXTERNALS_DIR}
136137
BINARY_DIR "${commsdsl2comms_bin_dir}"
137138
)
@@ -143,7 +144,7 @@ endif ()
143144

144145
function (dsl_parse type name)
145146
set (prefix DSL_PARSE)
146-
set (options)
147+
set (options MULTI_SCHEMA)
147148
set (oneValueArgs SRC_DIR)
148149
set (mutiValueArgs SCHEMAS)
149150
cmake_parse_arguments(${prefix} "${options}" "${oneValueArgs}" "${mutiValueArgs}" ${ARGN})
@@ -158,6 +159,11 @@ function (dsl_parse type name)
158159
set (code_input_param -c ${DSL_PARSE_SRC_DIR})
159160
file (GLOB_RECURSE src_files "${DSL_PARSE_SRC_DIR}/*")
160161
endif ()
162+
163+
set (multi_schema_param)
164+
if (DSL_PARSE_MULTI_SCHEMA)
165+
set (multi_schema_param "-s")
166+
endif ()
161167

162168
set (commsdsl_tgt_dep)
163169
if (TARGET ${COMMSDSL_TGT})
@@ -176,7 +182,7 @@ function (dsl_parse type name)
176182
OUTPUT ${output_dir}
177183
DEPENDS ${DSL_PARSE_SCHEMAS} ${src_files} ${commsdsl_tgt_dep} ${name}_prot_rm
178184
COMMAND ${CMAKE_COMMAND} -E remove_directory ${output_dir}
179-
COMMAND ${COMMSDSL2COMMS} --warn-as-err ${code_input_param} "--comms-tag=${CC_COMMS_TAG}"
185+
COMMAND ${COMMSDSL2COMMS} --warn-as-err ${multi_schema_param} ${code_input_param} "--comms-tag=${CC_COMMS_TAG}"
180186
-o ${output_dir} -i ${CMAKE_CURRENT_BINARY_DIR}/${name}/schema_files.txt
181187
)
182188

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ $> nmake install
165165
- [tutorial19](../../tree/master/tutorials/tutorial19) - Introduction to protocol version support.
166166
- [tutorial20](../../tree/master/tutorials/tutorial20) - Reporting protocol version in one of the messages.
167167
- [tutorial21](../../tree/master/tutorials/tutorial21) - Cast between different field types.
168+
- [tutorial22](../../tree/master/tutorials/tutorial22) - Complex length fields.
169+
- [tutorial23](../../tree/master/tutorials/tutorial23) - Reusing definitions from other schemas.
168170

169171

170172
# How-Tos

howtos/howto1/include/howto1/Interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains definition of <b>"Interface"</b> interface class.

howtos/howto1/include/howto1/InterfaceCommon.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains common template parameters independent functionality of

howtos/howto1/include/howto1/MsgId.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains definition of message ids enumeration.

howtos/howto1/include/howto1/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains protocol version definition.
@@ -22,6 +22,6 @@ inline constexpr unsigned specVersion()
2222
} // namespace howto1
2323

2424
// Generated compile time check for minimal supported version of the COMMS library
25-
static_assert(COMMS_MAKE_VERSION(4, 0, 0) <= comms::version(),
25+
static_assert(COMMS_MAKE_VERSION(5, 0, 0) <= comms::version(),
2626
"The version of COMMS library is too old");
2727

howtos/howto1/include/howto1/dispatch/DispatchClientInputMessage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for client input input messages.
@@ -185,7 +185,7 @@ struct ClientInputMsgDispatcher
185185

186186
/// @brief Message dispatcher class to be used with
187187
/// @b comms::processAllWithDispatchViaDispatcher() function (or similar).
188-
/// @details Same as @ref ClientInputMsgDispatcher, but passing
188+
/// @details Same as ClientInputMsgDispatcher, but passing
189189
/// @ref howto1::options::DefaultOptions as template parameter.
190190
/// @note Defined in howto1/dispatch/DispatchClientInputMessage.h
191191
using ClientInputMsgDispatcherDefaultOptions =

howtos/howto1/include/howto1/dispatch/DispatchMessage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for all input messages.
@@ -185,7 +185,7 @@ struct MsgDispatcher
185185

186186
/// @brief Message dispatcher class to be used with
187187
/// @b comms::processAllWithDispatchViaDispatcher() function (or similar).
188-
/// @details Same as @ref MsgDispatcher, but passing
188+
/// @details Same as MsgDispatcher, but passing
189189
/// @ref howto1::options::DefaultOptions as template parameter.
190190
/// @note Defined in howto1/dispatch/DispatchMessage.h
191191
using MsgDispatcherDefaultOptions =

howtos/howto1/include/howto1/dispatch/DispatchServerInputMessage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2comms v4.0.0
1+
// Generated by commsdsl2comms v5.0.0
22

33
/// @file
44
/// @brief Contains dispatch to handling function(s) for client input input messages.
@@ -185,7 +185,7 @@ struct ServerInputMsgDispatcher
185185

186186
/// @brief Message dispatcher class to be used with
187187
/// @b comms::processAllWithDispatchViaDispatcher() function (or similar).
188-
/// @details Same as @ref ServerInputMsgDispatcher, but passing
188+
/// @details Same as ServerInputMsgDispatcher, but passing
189189
/// @ref howto1::options::DefaultOptions as template parameter.
190190
/// @note Defined in howto1/dispatch/DispatchServerInputMessage.h
191191
using ServerInputMsgDispatcherDefaultOptions =

0 commit comments

Comments
 (0)