Release v2.3

commschamp · Apr 20, 2023 · 1025466 · 1025466
2 parents cc22254 + e4720e0
commit 1025466
Show file tree

Hide file tree

Showing 5 changed files with 404 additions and 9 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
@@ -30,7 +30,8 @@ option (UBLOX_BUILD_EXAMPLES "Build examples." OFF)
 # COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
 # COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
 
-set (VERSION "2.2")
+set (UBLOX_VERSION "2.3")
+set (UBLOX_MIN_COMMSDSL_VERSION "6.1")
 
 set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
 
@@ -252,6 +253,10 @@ endif ()
 include (ExternalProject)
 if (UBLOX_GEN_PROTOCOL)
     find_program(COMMSDSL2COMMS commsdsl2comms PATH_SUFFIXES bin REQUIRED)        
+    execute_process(COMMAND "${COMMSDSL2COMMS}" --version OUTPUT_VARIABLE commsdsl2comms_version)
+    if ("${commsdsl2comms_version}" VERSION_LESS "${UBLOX_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2comms is too old, required minimum is v${UBLOX_MIN_COMMSDSL_VERSION}.")
+    endif ()
 
     set (prot_tmp_dir "${CMAKE_BINARY_DIR}/output.tmp")
 
@@ -262,7 +267,7 @@ if (UBLOX_GEN_PROTOCOL)
     add_custom_command(
         OUTPUT ${prot_tmp_dir}
         DEPENDS ${schema_files} ${src_files} rm_prot_tmp_tgt
-        COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${VERSION}
+        COMMAND ${COMMSDSL2COMMS} ${warn_as_error} -V ${UBLOX_VERSION}
             -o ${prot_tmp_dir} 
             -c ${code_input_dir} -p ${PROJECT_SOURCE_DIR} -i ${UBLOX_SCHEMA_FILES_LIST_FILE} 
             ${COMMSDSL2COMMS_EXTRA_ARGS} 
@@ -325,6 +330,10 @@ string (REPLACE ";" "|" combined_prefix_path_str "${combined_prefix_path}")
 
 if (UBLOX_GEN_TEST)
     find_program(COMMSDSL2TEST commsdsl2test PATH_SUFFIXES bin REQUIRED)        
+    execute_process(COMMAND "${COMMSDSL2TEST}" --version OUTPUT_VARIABLE commsdsl2test_version)
+    if ("${commsdsl2test_version}" VERSION_LESS "${UBLOX_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2test is too old, required minimum is v${UBLOX_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (test_tmp_dir "${CMAKE_BINARY_DIR}/output_test.tmp")
 
@@ -373,13 +382,18 @@ if (UBLOX_GEN_TEST)
                 -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}           
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
                 -DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
+                -DOPT_TEST_OPTIONS=cc_ublox::options::AllMessagesDynMemMsgFactoryDefaultOptions
         )   
     endif ()
 endif ()
 
 
 if (UBLOX_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 "${UBLOX_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2tools_qt is too old, required minimum is v${UBLOX_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (tools_tmp_dir "${CMAKE_BINARY_DIR}/output_tools.tmp")
 
@@ -434,6 +448,10 @@ endif ()
 
 if (UBLOX_GEN_SWIG)
     find_program(COMMSDSL2SWIG commsdsl2swig PATH_SUFFIXES bin REQUIRED)    
+    execute_process(COMMAND "${COMMSDSL2SWIG}" --version OUTPUT_VARIABLE commsdsl2swig_version)
+    if ("${commsdsl2swig_version}" VERSION_LESS "${UBLOX_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2swig is too old, required minimum is v${UBLOX_MIN_COMMSDSL_VERSION}.")
+    endif ()      
 
     set (swig_tmp_dir "${CMAKE_BINARY_DIR}/output_swig.tmp")
 
@@ -493,6 +511,10 @@ endif ()
 if (UBLOX_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 "${UBLOX_MIN_COMMSDSL_VERSION}")
+        message (FATAL_ERROR "Version of commsdsl2emscripten is too old, required minimum is v${UBLOX_MIN_COMMSDSL_VERSION}.")
+    endif ()    
 
     set (emscripten_tmp_dir "${CMAKE_BINARY_DIR}/output_emscripten.tmp")
 

diff --git a/script/full_debug_build.sh b/script/full_debug_build.sh
@@ -22,7 +22,7 @@ ${SCRIPT_DIR}/prepare_externals.sh
 cd ${BUILD_DIR}
 cmake .. -DCMAKE_INSTALL_PREFIX=${COMMON_INSTALL_DIR} \
     -DCMAKE_BUILD_TYPE=Debug -DUBLOX_GEN_TEST=ON \
-    -DUBLOX_GEN_TOOLS=ON  -DUBLOX_GEN_SWIG=ON -DUBLOX_GEN_EMSCRIPTEN=ON \
+    -DUBLOX_GEN_TOOLS=ON  -DUBLOX_GEN_SWIG=OFF -DUBLOX_GEN_EMSCRIPTEN=OFF \
     -DUBLOX_BUILD_EXAMPLES=ON "$@"
 
 procs=$(nproc)