Release v5.2.1

commschamp · Apr 9, 2024 · d6bf873 · d6bf873
2 parents 4d5ee0e + 50776ce
commit d6bf873
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 12 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -18,7 +18,7 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: v5.2.2
+    COMMS_TAG: v5.2.3
     matrix:
         - CPP_STD: 17
           QT_MAJOR: 5
@@ -44,7 +44,7 @@ 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 COMMS_TAG=%COMMS_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,7 +3,7 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: v5.2.2
+  COMMS_TAG: v5.2.3
 
 jobs:
 
@@ -18,7 +18,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    
@@ -40,7 +40,7 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -80,7 +80,7 @@ jobs:
             cpp: 20      
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Prepare Install
       run: sudo apt-get update --fix-missing    
@@ -102,7 +102,7 @@ jobs:
         COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
         COMMON_BUILD_TYPE: ${{matrix.type}}
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
-        COMMS_TAG: ${{env.COMMS_BRANCH}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
 
     - name: Configure CMake
       shell: bash
@@ -122,3 +122,61 @@ 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 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: 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}}
+
+    - 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;${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
+      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}} --target install
+      env:
+        VERBOSE: 1 
diff --git a/lib/include/cc_tools_qt/version.h b/lib/include/cc_tools_qt/version.h
@@ -28,7 +28,7 @@
 #define CC_TOOLS_QT_MINOR_VERSION 2U
 
 /// @brief Patch level of the library
-#define CC_TOOLS_QT_PATCH_VERSION 0U
+#define CC_TOOLS_QT_PATCH_VERSION 1U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_TOOLS_QT_MAKE_VERSION(major_, minor_, patch_) \
@@ -77,7 +77,7 @@ constexpr unsigned version()
     return CC_TOOLS_QT_VERSION;
 }
 
-static_assert(COMMS_MAKE_VERSION(5, 2, 2) <= comms::version(),
+static_assert(COMMS_MAKE_VERSION(5, 2, 3) <= comms::version(),
     "The version of COMMS library is too old");
 
 } // namespace cc_tools_qt
diff --git a/plugin/tcp_socket/server/TcpServerSocket.cpp b/plugin/tcp_socket/server/TcpServerSocket.cpp
@@ -50,12 +50,24 @@ const QString& tcpPortProp()
     return Str;
 }
 
+const QString& tcpLocalPortProp()
+{
+    static const QString Str("tcp.local_port");
+    return Str;
+}
+
 const QString& networkPortProp()
 {
     static const QString Str("network.port");
     return Str;
 }
 
+const QString& networkLocalPortProp()
+{
+    static const QString Str("network.local_port");
+    return Str;
+}
+
 }  // namespace
 
 TcpServerSocket::TcpServerSocket()
@@ -140,7 +152,9 @@ void TcpServerSocket::applyInterPluginConfigImpl(const QVariantMap& props)
     bool updated = false;
 
     static const QString* PortProps[] = {
+        &networkLocalPortProp(),
         &networkPortProp(),
+        &tcpLocalPortProp(),
         &tcpPortProp(),
     };    
 

diff --git a/plugin/tcp_socket/server/tcp_server_socket.json b/plugin/tcp_socket/server/tcp_server_socket.json
@@ -5,7 +5,9 @@
         "communication via TCP/IP connection.\n\n",
         "Accepts inter-plugin configuration values:\n",
         "    { \"tcp.port\": 1234} - Override the port configuration.\n",
-        "    { \"network.port\": 1234} - Alias to \"tcp.port\".\n"               
+        "    { \"tcp.local_port\": 1234} - Alias to \"tcp.port\".\n",
+        "    { \"network.port\": 1234} - Alias to \"tcp.port\".\n",
+        "    { \"network.local_port\": 1234} - Alias to \"tcp.port\".\n"               
     ],
     "type" : "socket"
 }
diff --git a/script/prepare_externals.bat b/script/prepare_externals.bat
@@ -14,7 +14,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%
 
@@ -51,7 +51,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
 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% ^
+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