Update tooling

Author: jgeudens

.github/workflows/ccpp.yml

@@ -8,33 +8,36 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: docker://jgeudens/qt-linux:6.4.1_build_1
+      image: docker://jgeudens/qt-linux:6.8.3_build_1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6.0.0
 
+      - name: Configure safe directory for git
+        run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
+      
       - name: Update Modules and Build
         run: bash scripts/build_linux.sh
 
       - name: Deploy
         run: bash scripts/deploy_linux.sh
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v5.0.0
         with:
           name: modbussim-linux
           path: ModbusSim*.AppImage
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6.0.0
 
       - name: Install Qt installer
-        run: pip3 install aqtinstall
+        run: pip3 install aqtinstall==3.3.0
 
       # Cache go build cache, used to speedup go test
       - name: Qt Build Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v5.0.0
         id: cache
         with:
           path: ${{ github.workspace }}\Qt
@@ -44,8 +47,8 @@ jobs:
         shell: cmd
         run: scripts\full_build_and_deploy_windows.bat '${{ steps.cache.outputs.cache-hit }}' ${{ github.workspace }}\Qt
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v5.0.0
         with:
-          name: modbussim-windows
+          name: modbusscope-windows
           path: |
-            release\bin\win\ModbusSim.zip
+            ModbusSim.zip

CMakeLists.txt

@@ -8,15 +8,14 @@ project(modbussim
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 # Find the QtCore library
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
+find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
 
 message(STATUS "Using Qt${QT_VERSION_MAJOR} version ${Qt${QT_VERSION_MAJOR}Core_VERSION}")
@@ -30,6 +29,8 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
     REQUIRED
 )
 
+qt_standard_project_setup()
+
 set(QT_LIB
     Qt::Widgets
     Qt::Xml
@@ -42,6 +43,13 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/testslave
 )
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+if (MINGW)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
+endif()
+
 SET(APP_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/src/mainwindow.cpp
@@ -91,3 +99,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 elseif(WIN32)
     # not required
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+

scripts/deploy_windows.bat

@@ -21,7 +21,10 @@ cd ..
 7z a ModbusSim.zip ".\%DEPLOY_DIR%\*"
 IF ERRORLEVEL 1 GOTO errorHandling
 
+cd ..\..\..
+move release\bin\win\ModbusSim.zip ModbusSim.zip
+
 EXIT
 
 :errorHandling
-EXIT /B 1
+EXIT /B 1

scripts/setup_windows.bat

@@ -9,7 +9,7 @@ echo QT_INSTALL_DIR: %QT_INSTALL_DIR%
 echo CACHE_HIT: %CACHE_HIT%
 
 REM Set configuration
-set QT=6.4.1
+set QT=6.8.3
 set QT_MODULES=qtserialbus qtserialport
 set QT_HOST=windows
 set QT_TARGET=desktop
@@ -28,10 +28,11 @@ REM Install Qt
 aqt install-qt --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% %QT% %QT_ARCH%  -m %QT_MODULES%
 
 REM Install Tools
-aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_mingw90 qt.tools.win64_mingw900
+REM Qt 6.8.x uses mingw 13.1.0 (GCC 13.1.0) (https://wiki.qt.io/MinGW)
+aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_mingw1310
 aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_cmake
 aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_ninja
-aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_openssl_x64
+aqt install-tool --outputdir %QT_INSTALL_DIR% %QT_HOST% %QT_TARGET% tools_opensslv3_x64
 
 :cache_hit
 
@@ -41,7 +42,7 @@ dir %QT_INSTALL_DIR%\Tools
 
 REM Set env variables with path
 set "PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\bin;%PATH%"
-set "PATH=%QT_INSTALL_DIR%\Tools\mingw1120_64\bin;%PATH%"
+set "PATH=%QT_INSTALL_DIR%\Tools\mingw1310_64\bin;%PATH%"
 set "PATH=%QT_INSTALL_DIR%\Tools\CMake_64\bin;%PATH%"
 set "PATH=%QT_INSTALL_DIR%\Tools\Ninja;%PATH%"
 
@@ -50,4 +51,4 @@ set "QML_IMPORT_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\qml\"
 set "QML2_IMPORT_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\qml\"
 set "CMAKE_PREFIX_PATH=%QT_INSTALL_DIR%\%QT%\%QT_ARCH_PATH%\lib\cmake\Qt6"
 
-set "OPENSSL_DIR=%QT_INSTALL_DIR%\Tools\OpenSSL\Win_x64\bin"
+set "OPENSSL_DIR=%QT_INSTALL_DIR%\Tools\OpenSSLv3\Win_x64\bin"