Release v6.3.2

commschamp · Apr 9, 2024 · 0a362f4 · 0a362f4
2 parents ead79b6 + a575177
commit 0a362f4
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 30 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -17,8 +17,8 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: v5.2.2
-    CC_TOOLS_QT_BRANCH: v5.2
+    COMMS_TAG: v5.2.3
+    CC_TOOLS_QT_TAG: v5.2.1
     matrix:
         - CPP_STD: 11
           EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
@@ -72,8 +72,8 @@ install:
     - set PATH=%PATH%;%QTDIR%\bin
     - set BUILD_DIR=%APPVEYOR_BUILD_FOLDER%\build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
     - if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
-    - set COMMS_TAG=%COMMS_BRANCH%
-    - set CC_TOOLS_QT_TAG=%CC_TOOLS_QT_BRANCH%
+    - set COMMS_TAG=%COMMS_TAG%
+    - set CC_TOOLS_QT_TAG=%CC_TOOLS_QT_TAG%
     - set COMMON_INSTALL_DIR=%BUILD_DIR%\install
     - set COMMON_BUILD_TYPE=%CONFIGURATION%
     - set COMMON_CXX_STANDARD=%CPP_STD%

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,8 +3,8 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: v5.2.2
-  CC_TOOLS_QT_BRANCH: v5.2
+  COMMS_TAG: v5.2.3
+  CC_TOOLS_QT_TAG: v5.2.1
 
 jobs:
   build_gcc_old_ubuntu_20_04:
@@ -20,7 +20,7 @@ jobs:
             cpp: 14        
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Add repositories
       run: |
@@ -47,8 +47,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
         CC_TOOLS_QT_SKIP: 1
 
     - name: Configure CMake
@@ -86,7 +86,7 @@ jobs:
         cpp: [11, 14, 17]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -108,8 +108,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -148,7 +148,7 @@ jobs:
         qt_ver: [5, 6]        
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -172,8 +172,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
         CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
 
     - name: Configure CMake
@@ -220,7 +220,7 @@ jobs:
 
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Add repositories
       run: |
@@ -248,8 +248,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -293,7 +293,7 @@ jobs:
             cpp: 20
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -315,8 +315,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}} 
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} 
 
     - name: Configure CMake
       shell: bash
@@ -363,7 +363,7 @@ jobs:
             cpp: 20          
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -387,8 +387,8 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
-        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}} 
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} 
         CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
 
     - name: Configure CMake
@@ -420,3 +420,67 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: ctest -V
+
+  build_msvc_2019:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        arch: [x64]
+        cpp: [11, 14, 17]
+        qt_ver: [5, 6]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build   
+
+    - name: Install Qt
+      if: ${{matrix.cpp >= 17}}
+      shell: cmd
+      run: |
+        choco install curl
+        curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
+        7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
+        echo QT_VER=${{env.QT_VER}} >>%GITHUB_ENV%
+        echo QTDIR=${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64 >>%GITHUB_ENV%
+      env:
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}        
+
+    - name: Prepare externals
+      shell: cmd
+      run: |
+        %GITHUB_WORKSPACE%\script\prepare_externals.bat
+      env:
+        BUILD_DIR: ${{runner.workspace}}/build
+        PLATFORM: ${{matrix.arch}}
+        EXTERNALS_DIR: ${{runner.workspace}}/externals
+        COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
+        COMMON_BUILD_TYPE: ${{matrix.type}}
+        COMMON_CXX_STANDARD: ${{matrix.cpp}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+        CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}} 
+        CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
+
+    - name: Configure CMake
+      shell: cmd
+      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;${{env.QTDIR}}" ^
+          -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} ^
+          -DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} ^
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON -DCOMMSDSL_BUILD_UNIT_TESTS=ON ^
+          -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
+      env:
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
+        TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"      
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: cmd
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1 
diff --git a/app/commsdsl2comms/src/CommsGenerator.cpp b/app/commsdsl2comms/src/CommsGenerator.cpp
@@ -68,7 +68,7 @@ namespace util = commsdsl::gen::util;
 namespace commsdsl2comms
 {
 
-const std::string MinCommsVersion("5.2.2");    
+const std::string MinCommsVersion("5.2.3");    
 
 const std::string& CommsGenerator::commsFileGeneratedComment()
 {

diff --git a/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp b/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp
@@ -66,7 +66,7 @@ namespace commsdsl2tools_qt
 namespace
 {
 
-const std::string MinToolsQtVersion("5.2.0");    
+const std::string MinToolsQtVersion("5.2.1");    
 
 } // namespace 
 

diff --git a/lib/include/commsdsl/version.h b/lib/include/commsdsl/version.h
@@ -26,7 +26,7 @@
 #define COMMSDSL_MINOR_VERSION 3U
 
 /// @brief Patch level of the library
-#define COMMSDSL_PATCH_VERSION 1U
+#define COMMSDSL_PATCH_VERSION 2U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define COMMSDSL_MAKE_VERSION(major_, minor_, patch_) \

diff --git a/script/prepare_externals.bat b/script/prepare_externals.bat
@@ -17,7 +17,7 @@ rem -----------------------------------------------------
 
 if [%BUILD_DIR%] == [] echo "BUILD_DIR hasn't been specified" & exit /b 1
 
-if [%GENERATOR%] == [] set GENERATOR="NMake Makefiles"
+if NOT [%GENERATOR%] == [] set GENERATOR_PARAM=-G %GENERATOR%
 
 if NOT [%PLATFORM%] == [] set PLATFORM_PARAM=-A %PLATFORM%
 
@@ -66,7 +66,7 @@ if exist %COMMS_SRC_DIR%/.git (
 echo "Building COMMS library..."
 mkdir "%COMMS_BUILD_DIR%"
 cd %COMMS_BUILD_DIR%
-cmake -G %GENERATOR% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
+cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
     -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% -DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD%
 if %errorlevel% neq 0 exit /b %errorlevel%
 cmake --build %COMMS_BUILD_DIR% --config %COMMON_BUILD_TYPE% --target install
@@ -95,7 +95,7 @@ if exist %CC_TOOLS_QT_SRC_DIR%/.git (
 echo "Building cc_tools_qt ..."
 mkdir "%CC_TOOLS_QT_BUILD_DIR%"
 cd %CC_TOOLS_QT_BUILD_DIR%
-cmake -G %GENERATOR% %PLATFORM_PARAM% -S %CC_TOOLS_QT_SRC_DIR% -B %CC_TOOLS_QT_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%CC_TOOLS_QT_INSTALL_DIR% ^
+cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %CC_TOOLS_QT_SRC_DIR% -B %CC_TOOLS_QT_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%CC_TOOLS_QT_INSTALL_DIR% ^
     -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% -DCC_TOOLS_QT_BUILD_APPS=OFF -DCMAKE_PREFIX_PATH=%COMMS_INSTALL_DIR%;%QTDIR% ^
     -DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD% %CC_TOOLS_QT_VERSION_OPT%
 if %errorlevel% neq 0 exit /b %errorlevel%