Release v5.3.3

commschamp · Sep 28, 2024 · a1bd532 · a1bd532
2 parents 961c060 + a885d98
commit a1bd532
Show file tree

Hide file tree

Showing 11 changed files with 580 additions and 262 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,7 +3,7 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_TAG: v5.2.6
+  COMMS_TAG: v5.2.7
 
 jobs:
 
@@ -58,7 +58,7 @@ jobs:
       shell: bash
       run: cmake --build . --config ${{matrix.type}} --target install
       env:
-        VERBOSE: 1    
+        VERBOSE: 1  
 
   build_gcc_ubuntu_24_04:
     runs-on: ubuntu-24.04
@@ -67,8 +67,11 @@ jobs:
       matrix:
         type: [Debug, Release, MinSizeRel]
         cc_ver: [13, 14]
-        cpp: [17, 20]
+        cpp: [17, 20, 23]
         qt_ver: [5, 6]
+        exclude:
+          - cc_ver: 13
+            cpp: 23 
 
     steps:
     - uses: actions/checkout@v4
@@ -77,7 +80,7 @@ jobs:
       run: sudo apt-get update --fix-missing    
 
     - name: Install Packages
-      run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
+      run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} doxygen dia
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build      
@@ -111,7 +114,12 @@ jobs:
       shell: bash
       run: cmake --build . --config ${{matrix.type}} --target install
       env:
-        VERBOSE: 1                
+        VERBOSE: 1 
+
+    - name: Documentation
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: make doc_cc_tools_qt                   
 
   build_clang_ubuntu_22_04:
     runs-on: ubuntu-22.04
@@ -182,8 +190,13 @@ jobs:
       matrix:
         type: [Debug, Release, MinSizeRel]
         cc_ver: [16, 17, 18]
-        cpp: [17, 20]
+        cpp: [17, 20, 23]
         qt_ver: [5, 6]
+        exclude:
+          - cc_ver: 16
+            cpp: 23
+          - cc_ver: 17
+            cpp: 23
 
     steps:
     - uses: actions/checkout@v4
@@ -192,7 +205,7 @@ jobs:
       run: sudo apt-get update --fix-missing    
 
     - name: Install Packages
-      run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev clang-${{matrix.cc_ver}}
+      run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev clang-${{matrix.cc_ver}} doxygen dia
 
     - name: Create Build Environment
       run: cmake -E make_directory ${{runner.workspace}}/build      
@@ -226,7 +239,12 @@ jobs:
       shell: bash
       run: cmake --build . --config ${{matrix.type}} --target install
       env:
-        VERBOSE: 1         
+        VERBOSE: 1   
+
+    - name: Documentation
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: make doc_cc_tools_qt          
 
   build_msvc_2019:
     runs-on: windows-2019

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,7 @@ option (CC_TOOLS_QT_WARN_AS_ERR "Treat warning as error" ON)
 option (CC_TOOLS_QT_USE_CCACHE "Use ccache on UNIX systems if it's available" OFF)
 option (CC_TOOLS_QT_STATIC_RUNTIME "Enable/Disable static runtime" OFF)
 option (CC_TOOLS_QT_WIN32_FORCE_CONSOLE_APPS "Force treating GUI apps as console ones even on Release" OFF)
+option (CC_TOOLS_QT_WITH_DEFAULT_SANITIZERS "Build with sanitizers" OFF)
 
 # More fine-grained options
 option (CC_TOOLS_QT_BUILD_PLUGIN_ECHO_SOCKET "Build echo socket plugin." ${CC_TOOLS_QT_BUILD_PLUGINS})
@@ -96,6 +97,10 @@ if (CC_TOOLS_QT_STATIC_RUNTIME)
     list (APPEND extra_opts STATIC_RUNTIME)
 endif ()
 
+if (CC_TOOLS_QT_WITH_DEFAULT_SANITIZERS)
+    list (APPEND extra_opts DEFAULT_SANITIZERS)
+endif ()
+
 if (CC_TOOLS_QT_USE_CCACHE)
     list (APPEND extra_opts USE_CCACHE)
     if (NOT "${CC_TOOLS_QT_CCACHE_EXECUTABLE}" STREQUAL "")
@@ -112,13 +117,21 @@ cc_msvc_force_warn_opt("/W4")
 find_package (Doxygen)
 if (DOXYGEN_FOUND)
     set (doc_output_dir "${DOC_INSTALL_DIR}/cc_tools_qt")
-    set (match_str "OUTPUT_DIRECTORY[^\n]*")
-    set (replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
-    set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")
+    set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")    
+
+    set (out_dir_match_str "OUTPUT_DIRECTORY[^\n]*")
+    set (out_dir_replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")
 
     set (config_file "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/doxygen.conf")
     file (READ ${config_file} config_text)
-    string (REGEX REPLACE "${match_str}" "${replacement_str}" modified_config_text "${config_text}")
+    string (REGEX REPLACE "${out_dir_match_str}" "${out_dir_replacement_str}" modified_config_text "${config_text}")
+
+    if (UNIX)
+        set (dia_path_match_str "DIA_PATH[^\n]*")
+        set (dia_path_replacement_str "DIA_PATH = ${PROJECT_SOURCE_DIR}/script")
+        string (REGEX REPLACE "${dia_path_match_str}" "${dia_path_replacement_str}" modified_config_text "${modified_config_text}")
+    endif ()
+
     file (WRITE "${output_file}" "${modified_config_text}")
 
     add_custom_target ("doc_cc_tools_qt"