Merge branch 'COVESA:master' into master

Author: LocutusOfBorg

.github/workflows/BuildPR.yml

@@ -67,7 +67,6 @@ jobs:
           name: DLTViewer-${{ matrix.macos }}-${{ matrix.abi }}
           path: build/dist/DLTViewer*.tgz
 
-
   buildUbuntu:
     name: Build ${{ matrix.ubuntu }}
     strategy:
@@ -95,7 +94,6 @@ jobs:
         with:
           name: DLTViewer-Ubuntu-24.04
           path: debtmp/covesa-dlt-viewer_*.deb
-  
 
   buildWindows:
     name: Build Windows

.github/workflows/Release.yml

@@ -111,7 +111,7 @@ jobs:
     name: Build ${{ matrix.ubuntu }}
     strategy:
       matrix:
-        ubuntu: [ ubuntu-22.04, ubuntu-24.04 ]
+        ubuntu: [ ubuntu-24.04 ]
     runs-on: ${{ matrix.ubuntu }}
     steps:
       - name: Checkout
@@ -120,25 +120,25 @@ jobs:
           fetch-depth: 0
           submodules: true
       - name: install build environment
-        run: scripts/linux/installUbuntu20.sh
+        run: scripts/linux/installUbuntu22and24.sh
       - name: Build project
-        run: scripts/linux/buildUbuntu20.sh
-      - name: Make artifact executable
-        run: chmod -R +x build/dist
+        run: scripts/linux/buildUbuntu22and24.sh
+      - name: Create package
+        run: ./build_viewer_debs_noble.sh
       - name: Archive artifact
-        run: zip DLT-Linux-${{ matrix.abi }} -r build/dist
-      - name: Upload DLT artifact
+        if: ${{ success() }}
         uses: actions/upload-artifact@v4
         with:
-          name: DLT-Linux-${{ matrix.abi }}
-          path: DLT-Linux*.zip
+          name: DLTViewer-${{ matrix.ubuntu }}
+          path: debtmp/covesa-dlt-viewer_*.deb
+    continue-on-error: true
 
   buildWindows:
     name: Build Windows
     strategy:
       matrix:
         task: [ parser, sdk ]
-        qt: [ 5 ]
+        qt: [ 6 ]
     runs-on: windows-2022
     steps:
       - name: Checkout
@@ -149,12 +149,10 @@ jobs:
       - name: Install qt
         uses: jurplel/install-qt-action@v4
         with:
-          mirror: http://ftp.fau.de/qtproject/
-          version: 5.15.2
+          modules: qtserialport
       - name: Build with CMake ${{ matrix.task }}
         run: >
           $env:WORKSPACE=$env:GITHUB_WORKSPACE;
-          $env:QTDIR=$env:Qt5_DIR.Replace('/','\');
           $env:CPACK_7Z="true";
           $env:CPACK_NSIS="true";
           ./build_sdk_windows_qt${{ matrix.qt }}_MSVC_cmake.bat
@@ -171,7 +169,7 @@ jobs:
 
   createRelease:
     name: Create release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [ buildMac, buildLinux, buildWindows ]
     steps:
       - name: Checkout
@@ -183,6 +181,8 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: DLT-Linux
+        continue-on-error: true
+        
       - name: Download DLT macOS artifacts arm64
         uses: actions/download-artifact@v4
         with:

.gitignore

@@ -1,16 +1,17 @@
 .gitconfig
 CMakeLists.txt.user
-*.pro.user
 build/
 .project
 Makefile
 buildlib/
 release/
 .cproject
-*.pro.user*
 .settings
 *.orig
 *~
 .idea
 .cache
 compile_commands.json
+# deb packaging directories
+debian/
+debtmp/

BuildDltParser.pro

@@ -19,6 +19,14 @@ cmake_minimum_required (VERSION 3.15)
 include(scripts/windows/version.cmake)
 include(scripts/linux/version.cmake)
 
+message(STATUS "COVESA DLT Viewer version: ${DLT_PROJECT_VERSION_MAJOR}.${DLT_PROJECT_VERSION_MINOR}.${DLT_PROJECT_VERSION_PATCH}")
+if(NOT DLT_PROJECT_VERSION_MAJOR OR NOT DLT_PROJECT_VERSION_MINOR OR NOT DLT_PROJECT_VERSION_PATCH)
+    set(DLT_PROJECT_VERSION_MAJOR 0)
+    set(DLT_PROJECT_VERSION_MINOR 0)
+    set(DLT_PROJECT_VERSION_PATCH 0)
+endif()
+message(STATUS "COVESA DLT Viewer version: ${DLT_PROJECT_VERSION_MAJOR}.${DLT_PROJECT_VERSION_MINOR}.${DLT_PROJECT_VERSION_PATCH}")
+
 project(dlt-viewer
     VERSION ${DLT_PROJECT_VERSION_MAJOR}.${DLT_PROJECT_VERSION_MINOR}.${DLT_PROJECT_VERSION_PATCH}
     DESCRIPTION "DLT Viewer")

BuildDltViewer.pro

@@ -6,7 +6,7 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
 
 * Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019
 * Tested with QT 5.15.2 (Windows), QT 6.7.3 (Windows), and Qt 5.15.13 (Ubuntu 24.04LTS Linux)
-* Open project BuildDltViewer.pro in Qt Creator.
+* Open project CMakeLists.txt in Qt Creator.
 * Ensure that build options point to correct QT and MSVC.
 * Build Release in Qt Creator or via CMake (see last).
 * Optional Linux: set the library path in Qt Creator: Add variable to Projects/Build Settings/Build Environment: LD_LIBRARY_PATH = .
@@ -19,7 +19,7 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
 * sudo apt install libqt5serialport5-dev
 * mkdir build
 * cd build
-* qmake ../BuildDltViewer.pro
+* cmake ..
 * make
 * sudo make install
 * sudo ldconfig
@@ -129,6 +129,7 @@ Steps to follow:
 
 * mkdir build
 * cd build
+* TODO: Change to cmake
 * <path to Qt folder>/Qt/5.X/gcc_64/bin/qmake <path to BuildDltViewer.pro>/BuildDltViewer.pro -r
 * make
 

CMakeLists.txt

@@ -5,19 +5,14 @@ echo ************************************
 echo *** Setting up environment ***
 
 REM Currently tested combinations by Qt installation
-REM 5.15.2 msvc2019
-REM 6.7.3 msvc2022
+REM 6.8.3 msvc2022
 
 if "%QTNO%"=="" (
    set QTNO=6
 )
 
 if "%QTVER%"=="" (
-   if "%QTNO%"=="5" (
-		set QTVER=5.15.2
-   )  else (
-		set QTVER=6.7.3
-   )
+    set QTVER=6.8.3
 )
 
 if "%MSVC_VER%"=="" (