Release v2.3

commschamp · Apr 20, 2023 · 7bafa31 · 7bafa31
2 parents 7acd45d + cbc9aed
commit 7bafa31
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 23 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,9 +19,9 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: master
-    COMMSDSL_BRANCH: master
-    CC_TOOLS_QT_BRANCH: master
+    COMMS_BRANCH: v5.2
+    COMMSDSL_BRANCH: v6.1
+    CC_TOOLS_QT_BRANCH: v4.1
     matrix:
         - CPP_STD: 11
         - CPP_STD: 14

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,9 +3,9 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: master
-  COMMSDSL_BRANCH: master
-  CC_TOOLS_QT_BRANCH: master
+  COMMS_BRANCH: v5.2
+  COMMSDSL_BRANCH: v6.1
+  CC_TOOLS_QT_BRANCH: v4.1
 
 jobs:
   build_gcc_old_ubuntu_20_04:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,8 @@ option (DEMO1_BUILD_EXAMPLES "Build examples." ON)
 # COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
 # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
 
-set (VERSION "2.2")
+set (DEMO1_VERSION "2.3")
+set (DEMO1_MIN_COMMSDSL_VERSION "6.1")
 
 set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
 
@@ -75,6 +76,10 @@ endif ()
 include (ExternalProject)
 if (DEMO1_GEN_PROTOCOL)
     find_program(COMMSDSL2COMMS commsdsl2comms PATH_SUFFIXES bin REQUIRED)        
+    execute_process(COMMAND "${COMMSDSL2COMMS}" --version OUTPUT_VARIABLE commsdsl2comms_version)
+    if ("${commsdsl2comms_version}" VERSION_LESS "${DEMO1_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2comms is too old, required minimum is v${DEMO1_MIN_COMMSDSL_VERSION}.")
+    endif ()
 
     set (prot_tmp_dir "${CMAKE_BINARY_DIR}/output.tmp")
 
@@ -85,7 +90,7 @@ if (DEMO1_GEN_PROTOCOL)
     add_custom_command(
         OUTPUT ${prot_tmp_dir}
         DEPENDS ${schema_file} ${src_files} rm_prot_tmp_tgt
-        COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${VERSION}
+        COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${DEMO1_VERSION}
             -o ${prot_tmp_dir} 
             ${COMMSDSL2COMMS_EXTRA_ARGS}  ${schema_file}
     )
@@ -147,6 +152,10 @@ string (REPLACE ";" "|" combined_prefix_path_str "${combined_prefix_path}")
 
 if (DEMO1_GEN_TEST)
     find_program(COMMSDSL2TEST commsdsl2test PATH_SUFFIXES bin REQUIRED)        
+    execute_process(COMMAND "${COMMSDSL2TEST}" --version OUTPUT_VARIABLE commsdsl2test_version)
+    if ("${commsdsl2test_version}" VERSION_LESS "${DEMO1_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2test is too old, required minimum is v${DEMO1_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (test_tmp_dir "${CMAKE_BINARY_DIR}/output_test.tmp")
 
@@ -201,6 +210,10 @@ endif ()
 
 if (DEMO1_GEN_TOOLS)
     find_program(COMMSDSL2TOOLS_QT commsdsl2tools_qt PATH_SUFFIXES bin REQUIRED)    
+    execute_process(COMMAND "${COMMSDSL2TOOLS_QT}" --version OUTPUT_VARIABLE commsdsl2tools_qt_version)
+    if ("${commsdsl2tools_qt_version}" VERSION_LESS "${DEMO1_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2tools_qt is too old, required minimum is v${DEMO1_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (tools_tmp_dir "${CMAKE_BINARY_DIR}/output_tools.tmp")
 
@@ -219,7 +232,7 @@ if (DEMO1_GEN_TOOLS)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${tools_tmp_dir}" -DOUTPUT="${DEMO1_TOOLS_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${tools_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
+        DEPENDS ${tools_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
 
     if (DEMO1_BUILD_TOOLS)
         if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
@@ -255,6 +268,10 @@ endif ()
 
 if (DEMO1_GEN_SWIG)
     find_program(COMMSDSL2SWIG commsdsl2swig PATH_SUFFIXES bin REQUIRED)    
+    execute_process(COMMAND "${COMMSDSL2SWIG}" --version OUTPUT_VARIABLE commsdsl2swig_version)
+    if ("${commsdsl2swig_version}" VERSION_LESS "${DEMO1_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2swig is too old, required minimum is v${DEMO1_MIN_COMMSDSL_VERSION}.")
+    endif ()      
 
     set (swig_tmp_dir "${CMAKE_BINARY_DIR}/output_swig.tmp")
 
@@ -273,7 +290,7 @@ if (DEMO1_GEN_SWIG)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${swig_tmp_dir}" -DOUTPUT="${DEMO1_SWIG_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${swig_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
+        DEPENDS ${swig_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
 
     if (DEMO1_BUILD_SWIG)
         if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))
@@ -315,6 +332,10 @@ endif ()
 if (DEMO1_GEN_EMSCRIPTEN)
     find_program(COMMSDSL2EMSCRIPTEN commsdsl2emscripten PATH_SUFFIXES bin REQUIRED)    
     find_program(EMCMAKE_EXECUTABLE emcmake REQUIRED)    
+    execute_process(COMMAND "${COMMSDSL2EMSCRIPTEN}" --version OUTPUT_VARIABLE commsdsl2emscripten_version)
+    if ("${commsdsl2emscripten_version}" VERSION_LESS "${DEMO1_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2emscripten is too old, required minimum is v${DEMO1_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (emscripten_tmp_dir "${CMAKE_BINARY_DIR}/output_emscripten.tmp")
 
@@ -333,7 +354,7 @@ if (DEMO1_GEN_EMSCRIPTEN)
         COMMAND ${CMAKE_COMMAND}
             -DGENERATED="${emscripten_tmp_dir}" -DOUTPUT="${DEMO1_EMSCRIPTEN_OUTPUT_DIR}"
             -P "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake"        
-        DEPENDS ${emscripten_tmp_dir} ${readme_file} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
+        DEPENDS ${emscripten_tmp_dir} "${CMAKE_CURRENT_LIST_DIR}/CopyGenerated.cmake" ${schema_file})
 
     if (DEMO1_BUILD_EMSCRIPTEN)
         if ((NOT DEMO1_GEN_PROTOCOL) OR (NOT DEMO1_BUILD_PROTOCOL))

diff --git a/examples/client/Client.h b/examples/client/Client.h
@@ -32,7 +32,7 @@ class Client
             comms::option::Handler<Client> 
         >;
 
-    using InAckMsg = cc_demo1::message::Ack<InputMsg>;
+    CC_DEMO1_ALIASES_FOR_CLIENT_INPUT_MESSAGES_DEFAULT_OPTIONS(In,Msg,InputMsg);
 
     void handle(InAckMsg& msg);
     void handle(InputMsg&);

diff --git a/examples/server/Session.h b/examples/server/Session.h
@@ -46,17 +46,7 @@ class Session
             comms::option::NameInterface
         >;
 
-    using InSimpleInts = cc_demo1::message::SimpleInts<InputMsg>;
-    using InScaledInts = cc_demo1::message::ScaledInts<InputMsg>;
-    using InFloats = cc_demo1::message::Floats<InputMsg>;
-    using InEnums = cc_demo1::message::Enums<InputMsg>;
-    using InSets = cc_demo1::message::Sets<InputMsg>;
-    using InBitfields = cc_demo1::message::Bitfields<InputMsg>;
-    using InStrings = cc_demo1::message::Strings<InputMsg>;
-    using InDatas = cc_demo1::message::Datas<InputMsg>;
-    using InLists = cc_demo1::message::Lists<InputMsg>;
-    using InOptionals = cc_demo1::message::Optionals<InputMsg>;
-    using InVariants = cc_demo1::message::Variants<InputMsg>;
+    CC_DEMO1_ALIASES_FOR_SERVER_INPUT_MESSAGES_DEFAULT_OPTIONS(In,,InputMsg);
 
     void handle(InSimpleInts& msg);
     void handle(InScaledInts& msg);