Merge branch 'COVESA:master' into Feature-HighLightAndJumpToMissingMessages

Author: Renu-Priya411

.github/workflows/BuildPR.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   buildMac:
-    name: Build macOS
+    name: Build ${{ matrix.macos }} (${{ matrix.abi }}) with Qt${{ matrix.qt }}
     runs-on: ${{ matrix.macos }}
     strategy:
       fail-fast: false
@@ -17,15 +17,6 @@ jobs:
         abi: [ x86 ]
         xcode: [ Xcode_15.2 ]
         qt: [ 5 ]
-        include:
-          - macos: macos-14
-            abi: arm64
-            xcode: Xcode
-            qt: 5
-          - macos: macos-15
-            abi: arm64
-            xcode: Xcode
-            qt: 5
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -53,53 +44,16 @@ jobs:
           MACOS_CERTIFICATE_PWD: ${{ secrets.P12_PASSWORD }}
           MACOS_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
           MACOS_CI_KEYCHAIN_PWD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # Turn our base64-encoded certificate back to a regular .p12 file
-          
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          # We need to create a new keychain, otherwise using the certificate will prompt
-          # with a UI dialog asking for the certificate password, which we can't
-          # use in a headless CI environment
-          
-          security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain 
-          security default-keychain -s build.keychain
-          security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-          
-          # We finally codesign our app bundle, specifying the Hardened runtime option
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/Frameworks/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/Resources/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/bearer/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents//PlugIns/iconengines/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/imageformats/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/platforminputcontexts/*
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/platforms/*
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/printsupport/*
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/styles/*
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/PlugIns/virtualkeyboard/* 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/plugins/*
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/dlt-commander 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app/Contents/MacOS/dlt-viewer 
-          /usr/bin/codesign --timestamp --options=runtime -s "$MACOS_CERTIFICATE_NAME" -f -v /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app
+        run: scripts/darwin/codesign.sh
+
       - name: Notarize app bundle
         if: "! github.event.pull_request.head.repo.fork " # not running on a fork
         env:
           PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_ID }}
           PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.TEAM_ID }}
           PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.APP_PASSWORD }}
-        run: |
-          echo "Create keychain profile"
-          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"
-          echo "Creating temp notarization archive"
-          ditto -c -k --keepParent "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app" "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip"
-          
-          echo "Notarize app"
-          xcrun notarytool submit "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip" --keychain-profile "notarytool-profile" --wait
-          
-          echo "Attach staple"
-          xcrun stapler staple "/Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.app"
-          rm -r /Users/runner/work/dlt-viewer/dlt-viewer/build/install/DLTViewer.zip
+        run: scripts/darwin/notarize.sh
+
       - name: Artifact Creation
         run: |
           cd /Users/runner/work/dlt-viewer/dlt-viewer/build
@@ -132,13 +86,23 @@ jobs:
         run: scripts/linux/buildUbuntu22and24.sh
       - name: Run tests
         run: ctest --test-dir build/qdlt
+      - name: Create package
+        if: ${{ matrix.ubuntu == 'ubuntu-24.04' }}
+        run: ./build_viewer_debs_noble.sh
+      - name: Archive artifact
+        if: ${{ matrix.ubuntu == 'ubuntu-24.04' && success() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: DLTViewer-Ubuntu-24.04
+          path: debtmp/covesa-dlt-viewer_*.deb
+  
 
   buildWindows:
     name: Build Windows
     strategy:
       matrix:
         task: [ sdk ]
-        qt: [ 5 ]
+        qt: [ 6 ]
     runs-on: windows-2022
     steps:
       - name: Checkout
@@ -149,11 +113,10 @@ jobs:
       - name: Install qt
         uses: jurplel/install-qt-action@v4
         with:
-          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
@@ -166,3 +129,89 @@ jobs:
             build/dist/DLTViewer*.7z
             build/dist/DLTViewer*.exe
             build/dist/*.md
+
+  buildMacOSQt6:
+    name: "Build MacOS ${{ matrix.osversion }} with Qt 6"
+    runs-on: macos-${{ matrix.osversion }}
+    strategy:
+      fail-fast: false
+      matrix:
+        osversion: [ 14, 15 ]
+
+    steps:
+    - name: Checkout source
+      uses: actions/checkout@v4
+
+    - name: Install Qt 6 (Framework build)
+      uses: jurplel/install-qt-action@v4
+      with:
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qtserialport'
+
+    - name: Configure project with CMake
+      run: |
+        mkdir build
+        cd build
+        echo "QT_ROOT_DIR=$QT_ROOT_DIR"
+        APP_DIR_NAME="DLTViewer.app"
+        cmake -G Ninja -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR/lib/cmake \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DDLT_USE_QT_RPATH=OFF \
+        -DDLT_PARSER=OFF \
+        -DDLT_APP_DIR_NAME=${APP_DIR_NAME} \
+        -DDLT_LIBRARY_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/Frameworks" \
+        -DDLT_EXECUTABLE_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/MacOS" \
+        -DDLT_RESOURCE_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/Resources" \
+        -DDLT_PLUGIN_INSTALLATION_PATH="${APP_DIR_NAME}/Contents/MacOS/plugins" \
+        ..
+
+    - name: Build project
+      run: |
+        cmake --build build --parallel 4
+
+    - name: Install and deploy with macdeployqt
+      run: |
+        cmake --install build --prefix $(pwd)/build/install
+        ls -l build/install/DLTViewer.app
+        otool -L build/install/DLTViewer.app/Contents/MacOS/dlt-viewer
+        otool -l build/install/DLTViewer.app/Contents/MacOS/dlt-viewer | grep -A2 LC_RPATH
+        echo "Deploying DLTViewer.app with macdeployqt"
+        $QT_ROOT_DIR/bin/macdeployqt build/install/DLTViewer.app -verbose=2 -dmg \
+            -libpath=$(pwd)/build/install/DLTViewer.app/Contents/Frameworks \
+            -executable=$(pwd)/build/install/DLTViewer.app/Contents/MacOS/dlt-viewer
+
+    - name: Codesign app bundle
+      if: "! github.event.pull_request.head.repo.fork " # not running on a fork
+       # Extract the secrets we defined earlier as environment variables
+      env:
+        MACOS_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        MACOS_CERTIFICATE_PWD: ${{ secrets.P12_PASSWORD }}
+        MACOS_CERTIFICATE_NAME: ${{ secrets.APPLE_CERTIFICATE_NAME }}
+        MACOS_CI_KEYCHAIN_PWD: ${{ secrets.KEYCHAIN_PASSWORD }}
+      run: scripts/darwin/codesign.sh
+
+    - name: Notarize app bundle
+      if: "! github.event.pull_request.head.repo.fork " # not running on a fork
+      env:
+        PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.APPLE_ID }}
+        PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.TEAM_ID }}
+        PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.APP_PASSWORD }}
+      run: scripts/darwin/notarize.sh
+  
+    - name: Compress artifacts
+      run: |
+        cd $(pwd)/build
+        mkdir -p dist
+        tar -czvf "dist/DLTViewer-qt6-macos${{ matrix.osversion }}.tgz" -C $(pwd)/install .
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v4
+      if: ${{ success() }}
+      with:
+        name: DLTViewer-macos${{ matrix.osversion }}-qt6
+        path: build/dist/DLTViewer*.tgz
+
+

ReleaseNotes_Viewer.txt

@@ -17,6 +17,10 @@ Changes
 
 2.28.0
 
+* Fix marker when changing filter (#691)
+* add cmake presets and update gitignore
+* Fix regexp replace functionality in commander (#690)
+* Additionally fix the SimpleWriter by opening a file
 * Configure Keyboard Shortcuts (#637)
 * Add StartupWMClass to .desktop launcher (#686)
 * Restore string arg encoding  (#684)

build_sdk_windows_qt6_MSVC_cmake.bat

@@ -0,0 +1,136 @@
+REM @echo off
+
+REM Date     Version   Author                Changes
+REM 4.7.19   1.0       Alexander Wenzel      Update to Qt 5.12.4 and Visual Studio 2015
+REM 25.11.20 1.1       Alexander Wenzel      Update to Qt 5.12.10
+REM 11.1.21  1.2       Alexander Wenzel      Update to Qt 5.12.12, Visual Studio 2017 Build Tools, simplify and cmake
+REM 27.1.21  1.2       Alexander Wenzel      Update using cmake install
+
+echo ************************************
+echo ***      DLT Viewer SDK (cmake)  ***
+echo ************************************
+
+call build_config.bat
+
+REM https://stackoverflow.com/questions/4983508/can-i-have-an-if-block-in-dos-batch-file
+if "%WORKSPACE%"=="" (goto NO_WORKSPACE) else (goto WITH_WORKSPACE)
+:NO_WORKSPACE
+    echo WORKSPACE variable is not defined
+    set SOURCE_DIR=%CD%
+    set BUILD_DIR=%SOURCE_DIR%\build\release
+    set DIST_DIR=%SOURCE_DIR%\build\dist
+
+    if "%DLT_VIEWER_SDK_DIR%"=="" (
+        set DLT_VIEWER_SDK_DIR=c:\DltViewerSDKQt%QTNO%
+    )
+
+    goto Continue1
+:WITH_WORKSPACE
+    set SOURCE_DIR=%WORKSPACE%
+    set BUILD_DIR=%SOURCE_DIR%\build\release
+    set DIST_DIR=%SOURCE_DIR%\build\dist
+
+    if "%DLT_VIEWER_SDK_DIR%"=="" (
+        set DLT_VIEWER_SDK_DIR=%DIST_DIR%\DltViewerSDKQt%QTNO%
+    )
+:Continue1
+
+echo ************************************
+echo * QTDIR     = %QTDIR%
+echo * MSVC_DIR  = %MSVC_DIR%
+echo * PATH      = %PATH%
+echo * DLT_VIEWER_SDK_DIR = %DLT_VIEWER_SDK_DIR%
+echo * SOURCE_DIR         = %SOURCE_DIR%
+echo * BUILD_DIR          = %BUILD_DIR%
+echo * DIST_DIR           = %DIST_DIR%
+echo ************************************
+
+if exist build (
+echo ************************************
+echo ***  Delete old build Directory  ***
+echo ************************************
+
+    rmdir /s /q build || rem
+    if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+)
+
+echo ************************************
+echo ***  Configure MSVC environment  ***
+echo ************************************
+
+call vcvarsall.bat x86_amd64
+if %ERRORLEVEL% NEQ 0 goto ERROR_HANDLER
+echo configuring was successful
+
+if exist %DLT_VIEWER_SDK_DIR% (
+echo ************************************
+echo ***   Delete old SDK Directory   ***
+echo ************************************
+
+    rmdir /s /q %DLT_VIEWER_SDK_DIR% || rem
+    if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+)
+
+echo ************************************
+echo ***       Build DLT Viewer       ***
+echo ************************************
+
+mkdir build
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+cd build
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+mkdir Release
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+cd Release
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDLT_PARSER=ON -DCMAKE_INSTALL_PREFIX=%DLT_VIEWER_SDK_DIR% ..\..
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+for /f "skip=2 tokens=2 delims== " %%C in ('wmic cpu get NumberOfLogicalProcessors /value') do set /a PARALLEL=%%C-1
+if %PARALLEL% LSS 1 set PARALLEL=1
+
+echo * PARALLEL = %PARALLEL%
+
+cmake --build . --parallel %PARALLEL%
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+echo ************************************
+echo ***         Create SDK           ***
+echo ************************************
+
+cmake --install .
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+if "%CPACK_7Z%" NEQ "" (
+    echo CPack 7Z
+    "C:\Program Files\CMake\bin\cpack" -G 7Z
+    cp DLTViewer*.7z %DIST_DIR%\
+)
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+if "%CPACK_NSIS%" NEQ "" (
+    echo CPack NSIS
+    "C:\Program Files\CMake\bin\cpack" -G NSIS
+    cp DLTViewer*.exe %DIST_DIR%\
+)
+if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER
+
+GOTO QUIT
+
+:ERROR_HANDLER
+echo ####################################
+echo ###       ERROR occured          ###
+echo ####################################
+exit /b 1
+
+:QUIT
+echo ************************************
+echo ***       SUCCESS finish         ***
+echo ************************************
+echo SDK installed in: %DLT_VIEWER_SDK_DIR%
+exit /b 0

build_viewer_debs_noble.sh

@@ -2,7 +2,7 @@ Source: covesa-dlt-viewer
 Section: Development
 Priority: optional
 Maintainer: AlexanderWenzel <[email protected]>
-Build-Depends: debhelper (>= 9), qtbase5-dev, libqt5serialport5-dev
+Build-Depends: debhelper (>= 9), qt6-base-dev, qt6-serialport-dev
 
 Package: covesa-dlt-viewer
 Architecture: any

noble/debian/control

@@ -20,7 +20,7 @@ build-stamp:
 	dh_testdir
 
 	# Add here commands to compile the package.
-	qmake BuildDltViewer.pro
+	qmake6 BuildDltViewer.pro
 	make -j $(shell grep -c processor /proc/cpuinfo)
 	# --- end custom part for compiling
 

noble/debian/rules

@@ -18,7 +18,6 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
 }
 
 *-g++* {
-    QMAKE_CXXFLAGS += -std=gnu++0x
     QMAKE_CXXFLAGS += -Wall
     QMAKE_CXXFLAGS += -Wextra
     # Limit symbol visibility to avoid symbol clashes between different