Release 2024-04-14

commschamp · Apr 14, 2024 · d10cba1 · d10cba1
2 parents 644f3e1 + 5e073cd
commit d10cba1
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 16 deletions.
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -15,7 +15,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    
@@ -63,7 +63,7 @@ jobs:
             cpp: 20      
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -91,3 +91,55 @@ jobs:
       env:
         VERBOSE: 1 
 
+  build_msvc_2019:
+    runs-on: windows-2019
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release, MinSizeRel]
+        arch: [x64]
+        cpp: [17]
+        qt_ver: [5, 6]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build   
+
+    - name: Install Boost
+      shell: cmd
+      run: |
+        choco install boost-msvc-14.2
+
+    - name: Install Curl
+      shell: cmd
+      run: |
+        choco install curl
+
+    - name: Install Qt
+      shell: cmd
+      run: |
+        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
+      env:
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
+
+    - 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}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DBoost_USE_STATIC_LIBS=ON ^
+          -DCMAKE_PROJECT_INCLUDE=config/All.cmake -DOPT_QT_MAJOR_VERSION=${{matrix.qt_ver}} ^
+          -DOPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN=OFF
+      env:
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: cmd
+      run: cmake --build . --config ${{matrix.type}}
+      env:
+        VERBOSE: 1 
diff --git a/DefaultConfig.cmake b/DefaultConfig.cmake
@@ -1,25 +1,25 @@
 # Default versions
-set (COMMS_DEFAULT_TAG "v5.2.2")
-set (CC_TOOLS_QT_DEFAULT_TAG "v5.2")
-set (COMMSDSL_DEFAULT_TAG "v6.3.1")
-set (CC_DEMO1_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_DEMO2_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_DEMO3_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_MQTT311_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_MQTT5_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_MQTTSN_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_UBLOX_GENERATED_DEFAULT_TAG "v2.6")
-set (CC_X509_GENERATED_DEFAULT_TAG "v0.8")
-set (CC_MQTTSN_LIBS_DEFAULT_TAG "v1.0.7")
-set (CC_MQTT5_LIBS_DEFAULT_TAG "v0.3.1")
+set (COMMS_DEFAULT_TAG "v5.2.3")
+set (CC_TOOLS_QT_DEFAULT_TAG "v5.2.1")
+set (COMMSDSL_DEFAULT_TAG "v6.3.2")
+set (CC_DEMO1_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_DEMO2_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_DEMO3_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_MQTT311_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_MQTT5_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_MQTTSN_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_UBLOX_GENERATED_DEFAULT_TAG "v2.7")
+set (CC_X509_GENERATED_DEFAULT_TAG "v0.7")
+set (CC_MQTTSN_LIBS_DEFAULT_TAG "v1.0.8")
+set (CC_MQTT5_LIBS_DEFAULT_TAG "v0.4")
 set (CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO1_GENERATED_DEFAULT_TAG}")
 set (CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO2_GENERATED_DEFAULT_TAG}")
 set (CC_DEMO3_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO3_GENERATED_DEFAULT_TAG}")
 set (CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTT311_GENERATED_DEFAULT_TAG}")
 set (CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTT5_GENERATED_DEFAULT_TAG}")
 set (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTTSN_GENERATED_DEFAULT_TAG}")
 set (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_UBLOX_GENERATED_DEFAULT_TAG}")
-set (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.3")
+set (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.4")
 set (QT_MAJOR_DEFAULT_VERSION 5)
 
 ########################################################################

diff --git a/config/AllDevelop.cmake b/config/AllDevelop.cmake
@@ -0,0 +1,29 @@
+include (${PROJECT_SOURCE_DIR}/config/All.cmake)
+
+macro (set_develop_branch name)
+    if (NOT DEFINED ${name}_GIT_TAG)
+        set (${name}_GIT_TAG "develop")
+    endif ()
+endmacro ()
+
+set_develop_branch (COMMS)
+set_develop_branch (CC_TOOLS_QT)
+set_develop_branch (COMMSDSL)
+set_develop_branch (CC_DEMO1_GENERATED)
+set_develop_branch (CC_DEMO2_GENERATED)
+set_develop_branch (CC_DEMO3_GENERATED)
+set_develop_branch (CC_MQTT311_GENERATED)
+set_develop_branch (CC_MQTT5_GENERATED)
+set_develop_branch (CC_MQTTSN_GENERATED)
+set_develop_branch (CC_UBLOX_GENERATED)
+set_develop_branch (CC_X509_GENERATED)
+set_develop_branch (CC_MQTTSN_LIBS)
+set_develop_branch (CC_MQTT5_LIBS)
+set_develop_branch (CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_DEMO3_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
diff --git a/config/AllExceptTools.cmake b/config/AllExceptTools.cmake
@@ -0,0 +1,18 @@
+macro (enalbe_if_opt_not_set name)
+    if (NOT DEFINED ${name})
+        set (${name} ON)
+    endif ()
+endmacro()
+
+enalbe_if_opt_not_set (OPT_COMMS)
+enalbe_if_opt_not_set (OPT_COMMSDSL)
+enalbe_if_opt_not_set (OPT_CC_DEMO1_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_DEMO2_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_DEMO3_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_MQTT5_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_MQTTSN_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_UBLOX_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_X509_GENERATED)
+enalbe_if_opt_not_set (OPT_CC_MQTTSN_LIBS)
+enalbe_if_opt_not_set (OPT_CC_MQTT5_LIBS)