Merge pull request #228 from svlad-90/dev/vladyslav-goncharuk/ISSUE-227

svlad-90 · web-flow · commit 98cb15a542e2 · 2025-01-30T21:22:19.000+02:00
[ISSUE-227] Add delivery package for Windows OS
diff --git a/.github/workflows/build_clang_tidy_qt5.yml b/.github/workflows/build_clang_tidy_qt5.yml
@@ -44,12 +44,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
diff --git a/.github/workflows/build_clang_tidy_qt6.yml b/.github/workflows/build_clang_tidy_qt6.yml
@@ -44,12 +44,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
diff --git a/.github/workflows/build_linux_qt5.yml b/.github/workflows/build_linux_qt5.yml
@@ -39,12 +39,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the ${{ github.event.repository.name }}
diff --git a/.github/workflows/build_linux_qt6.yml b/.github/workflows/build_linux_qt6.yml
@@ -39,12 +39,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the ${{ github.event.repository.name }}
diff --git a/.github/workflows/build_windows_qt5.yml b/.github/workflows/build_windows_qt5.yml
@@ -11,6 +11,11 @@ on:
         description: 'Target branch'
         required: true
         default: 'master'
+      collect_artifacts:
+        description: 'Collect build artifacts'
+        required: false
+        default: 'false'
+        type: boolean
 
 jobs:
   build_windows:
@@ -21,17 +26,13 @@ jobs:
 
     - uses: ilammy/msvc-dev-cmd@v1
 
-    # Creation of the ..\downloads directory
-    - name: Creation of the "..\downloads" directory
-      run: mkdir ..\downloads
-      shell: cmd
-      working-directory: .\
-
-    # Creation of the ..\tools directory
-    - name: Creation of the "..\tools" directory
-      run: mkdir ..\tools
+    # Creation of the "..\downloads", "..\build", "..\tools" directories
+    - name: Creation of the "..\downloads", "..\build", "..\tools" directories
+      run: |
+        mkdir ..\build
+        mkdir ..\downloads
+        mkdir ..\tools
       shell: cmd
-      working-directory: .\
 
     # Installation of jom
     - name: Installation of the jom
@@ -59,12 +60,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
@@ -90,12 +91,6 @@ jobs:
          dir: ${{ github.workspace }}\Qt5
          cache: true
 
-    # Create build directory
-    - name: Creation of the ".\build" directory
-      run: mkdir ..\build
-      shell: cmd
-      working-directory: .\
-
     #CMake for dlt-viewer, including the DLT-Message_analyzer plugin
     - name: CMake
       run: |
@@ -106,13 +101,62 @@ jobs:
     #List files in build folder
     - name: List files in build folder
       run: |
-        dir
+        dir ..\build
+        dir .\
       shell: cmd
-      working-directory: ..\build
+      working-directory: .\
 
     # Build of the project
     - name: Jom
       run: |
         jom.exe -j8
       shell: cmd
       working-directory: ..\build
+
+    # Collect required artifacts
+    - name: Collect required artifacts
+      if: ${{ github.event.inputs.collect_artifacts == 'true' }}
+      run: |
+        mkdir .\release_win_qt5_X86_64
+        mkdir .\release_win_qt5_X86_64\plugins
+        mkdir .\release_win_qt5_X86_64\platforms
+        cp ..\build\bin\dlt-viewer.exe .\release_win_qt5_X86_64\dlt-viewer.exe
+        cp ..\build\version.txt .\release_win_qt5_X86_64\version.txt
+        cp ..\build\bin\plugins\DLT-Message-Analyzer.dll .\release_win_qt5_X86_64\plugins\DLT-Message-Analyzer.dll
+        cp ..\build\bin\plugins\dltdbusplugin.dll .\release_win_qt5_X86_64\plugins\dltdbusplugin.dll
+        cp ..\build\bin\plugins\dltlogstorageplugin.dll .\release_win_qt5_X86_64\plugins\dltlogstorageplugin.dll
+        cp ..\build\bin\plugins\dltsegmentationplugin.dll .\release_win_qt5_X86_64\plugins\dltsegmentationplugin.dll
+        cp ..\build\bin\plugins\dltsystemviewerplugin.dll .\release_win_qt5_X86_64\plugins\dltsystemviewerplugin.dll
+        cp ..\build\bin\plugins\dlttestrobotplugin.dll .\release_win_qt5_X86_64\plugins\dlttestrobotplugin.dll
+        cp ..\build\bin\plugins\dltviewerplugin.dll .\release_win_qt5_X86_64\plugins\dltviewerplugin.dll
+        cp ..\build\bin\plugins\filetransferplugin.dll .\release_win_qt5_X86_64\plugins\filetransferplugin.dll
+        cp ..\build\bin\plugins\nonverboseplugin.dll .\release_win_qt5_X86_64\plugins\nonverboseplugin.dll
+        cp ..\build\bin\plugins\plantuml.jar .\release_win_qt5_X86_64\plugins\plantuml.jar
+        cp ..\build\qdlt\qdlt.dll .\release_win_qt5_X86_64\qdlt.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qdirect2d.dll .\release_win_qt5_X86_64\platforms\qdirect2d.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qdirect2dd.dll .\release_win_qt5_X86_64\platforms\qdirect2dd.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qminimal.dll .\release_win_qt5_X86_64\platforms\qminimal.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qminimald.dll .\release_win_qt5_X86_64\platforms\qminimald.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qoffscreen.dll .\release_win_qt5_X86_64\platforms\qoffscreen.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qoffscreend.dll .\release_win_qt5_X86_64\platforms\qoffscreend.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qwindows.dll .\release_win_qt5_X86_64\platforms\qwindows.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\plugins\platforms\qwindowsd.dll .\release_win_qt5_X86_64\platforms\qwindowsd.dll
+        cp .\build\output\amd64\Release\bin\qcustomplot.dll .\release_win_qt5_X86_64\qcustomplot.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Core.dll .\release_win_qt5_X86_64\Qt5Core.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Gui.dll .\release_win_qt5_X86_64\Qt5Gui.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Network.dll .\release_win_qt5_X86_64\Qt5Network.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5PrintSupport.dll .\release_win_qt5_X86_64\Qt5PrintSupport.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5SerialPort.dll .\release_win_qt5_X86_64\Qt5SerialPort.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Sql.dll .\release_win_qt5_X86_64\Qt5Sql.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Svg.dll .\release_win_qt5_X86_64\Qt5Svg.dll
+        cp .\Qt5\Qt\5.15.0\msvc2019_64\bin\Qt5Widgets.dll .\release_win_qt5_X86_64\Qt5Widgets.dll
+      shell: cmd
+      working-directory: .\
+
+    - name: Upload artifacts
+      if: ${{ success() && github.event.inputs.collect_artifacts == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: release_win_qt5_X86_64
+        path: |
+          release_win_qt5_X86_64
diff --git a/.github/workflows/build_windows_qt6.yml b/.github/workflows/build_windows_qt6.yml
@@ -11,6 +11,11 @@ on:
         description: 'Target branch'
         required: true
         default: 'master'
+    collect_artifacts:
+      description: 'Collect build artifacts'
+      required: false
+      default: 'false'
+      type: boolean
 
 jobs:
   build_windows:
@@ -21,15 +26,12 @@ jobs:
 
     - uses: ilammy/msvc-dev-cmd@v1
 
-    # Creation of the ..\downloads directory
-    - name: Creation of the "..\downloads" directory
-      run: mkdir ..\downloads
-      shell: cmd
-      working-directory: .\
-
-    # Creation of the ..\tools directory
-    - name: Creation of the "..\tools" directory
-      run: mkdir ..\tools
+    # Creation of the "..\downloads", "..\build", "..\tools" directories
+    - name: Creation of the "..\downloads", "..\build", "..\tools" directories
+      run: |
+        mkdir ..\build
+        mkdir ..\downloads
+        mkdir ..\tools
       shell: cmd
       working-directory: .\
 
@@ -59,12 +61,12 @@ jobs:
       with:
         cmake-version: 'v3.24.x'
 
-    # Checkout dlt-viewer's revision v2.25.0
+    # Checkout dlt-viewer's revision 2.27.0
     - name: Checkout of the dlt-viewer
       uses: actions/checkout@v3
       with:
         repository: GENIVI/dlt-viewer
-        ref: v2.25.0
+        ref: 2.27.0
 
     # Checkout project's revision, which is pushed
     - name: Checkout of the project
@@ -91,12 +93,6 @@ jobs:
          cache: true
          modules: 'qtserialport'
 
-    # Create build directory
-    - name: Creation of the ".\build" directory
-      run: mkdir ..\build
-      shell: cmd
-      working-directory: .\
-
     #CMake for dlt-viewer, including the DLT-Message_analyzer plugin
     - name: CMake
       run: |
@@ -107,13 +103,62 @@ jobs:
     #List files in build folder
     - name: List files in build folder
       run: |
-        dir
+        dir ..\build
+        dir .\
       shell: cmd
-      working-directory: ..\build
+      working-directory: .\
 
     # Build of the project
     - name: Jom
       run: |
         jom.exe -j8
       shell: cmd
       working-directory: ..\build
+
+    # Collect required artifacts
+    - name: Collect required artifacts
+      if: ${{ github.event.inputs.collect_artifacts == 'true' }}
+      run: |
+        mkdir .\release_win_qt6_X86_64
+        mkdir .\release_win_qt6_X86_64\plugins
+        mkdir .\release_win_qt6_X86_64\platforms
+        cp ..\build\bin\dlt-viewer.exe .\release_win_qt6_X86_64\dlt-viewer.exe
+        cp ..\build\version.txt .\release_win_qt6_X86_64\version.txt
+        cp ..\build\bin\plugins\DLT-Message-Analyzer.dll .\release_win_qt6_X86_64\plugins\DLT-Message-Analyzer.dll
+        cp ..\build\bin\plugins\dltdbusplugin.dll .\release_win_qt6_X86_64\plugins\dltdbusplugin.dll
+        cp ..\build\bin\plugins\dltlogstorageplugin.dll .\release_win_qt6_X86_64\plugins\dltlogstorageplugin.dll
+        cp ..\build\bin\plugins\dltsegmentationplugin.dll .\release_win_qt6_X86_64\plugins\dltsegmentationplugin.dll
+        cp ..\build\bin\plugins\dltsystemviewerplugin.dll .\release_win_qt6_X86_64\plugins\dltsystemviewerplugin.dll
+        cp ..\build\bin\plugins\dlttestrobotplugin.dll .\release_win_qt6_X86_64\plugins\dlttestrobotplugin.dll
+        cp ..\build\bin\plugins\dltviewerplugin.dll .\release_win_qt6_X86_64\plugins\dltviewerplugin.dll
+        cp ..\build\bin\plugins\filetransferplugin.dll .\release_win_qt6_X86_64\plugins\filetransferplugin.dll
+        cp ..\build\bin\plugins\nonverboseplugin.dll .\release_win_qt6_X86_64\plugins\nonverboseplugin.dll
+        cp ..\build\bin\plugins\plantuml.jar .\release_win_qt6_X86_64\plugins\plantuml.jar
+        cp ..\build\qdlt\qdlt.dll .\release_win_qt6_X86_64\qdlt.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qdirect2d.dll .\release_win_qt6_X86_64\platforms\qdirect2d.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qdirect2dd.dll .\release_win_qt6_X86_64\platforms\qdirect2dd.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qminimal.dll .\release_win_qt6_X86_64\platforms\qminimal.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qminimald.dll .\release_win_qt6_X86_64\platforms\qminimald.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qoffscreen.dll .\release_win_qt6_X86_64\platforms\qoffscreen.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qoffscreend.dll .\release_win_qt6_X86_64\platforms\qoffscreend.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qwindows.dll .\release_win_qt6_X86_64\platforms\qwindows.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\plugins\platforms\qwindowsd.dll .\release_win_qt6_X86_64\platforms\qwindowsd.dll
+        cp .\build\output\amd64\Release\bin\qcustomplot.dll .\release_win_qt6_X86_64\qcustomplot.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Core.dll .\release_win_qt6_X86_64\Qt6Core.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Gui.dll .\release_win_qt6_X86_64\Qt6Gui.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Network.dll .\release_win_qt6_X86_64\Qt6Network.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6PrintSupport.dll .\release_win_qt6_X86_64\Qt6PrintSupport.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6SerialPort.dll .\release_win_qt6_X86_64\Qt6SerialPort.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Sql.dll .\release_win_qt6_X86_64\Qt6Sql.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Svg.dll .\release_win_qt6_X86_64\Qt6Svg.dll
+        cp .\Qt6\Qt\6.5.0\msvc2019_64\bin\Qt6Widgets.dll .\release_win_qt6_X86_64\Qt6Widgets.dll
+      shell: cmd
+      working-directory: .\
+
+    - name: Upload artifacts
+      if: ${{ success() && github.event.inputs.collect_artifacts == 'true' }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: release_win_qt6_X86_64
+        path: |
+          release_win_qt6_X86_64
diff --git a/README.md b/README.md
@@ -4,23 +4,16 @@
 
 ----
 
-## <span style="color:red">v.1.0.29 released!</span>
+## <span style="color:red">v.1.0.30 released!</span>
 
-New features in release v.1.0.29:
-
-- [Coverage note](./md/coverage_note/coverage_note.md)
-- [Grouped view highlighting](./md/grouped_view/grouped_view.md#highlighting-the-group-in-the-search-view)
-- [Regex history](.//md/search/search.md#regex-history)
-
-## Implemented features targeted for release v1.0.30:
-
-<span style="color:red">Use the HEAD revision to try out the following features:</span>
+New features in release v.1.0.30:
 
 - [Grouped view default application is disabled](./md/grouped_view/grouped_view.md#backward-compatibility-note)
 - [Groups nesting ordering](./md/grouped_view/grouped_view.md#groups-nesting-ordering)
 - [Plot legend scrolling](./md/plot_view/plot_view.md#legend-scrolling)
 - [Regex group name glossary](./md/search/search.md#regex-group-name-glossary)
 - [Regex text editor with the automatic height adjustment](./md/search/search.md#regex-text-editor)
+- [The search view inherits the auto-scroll option from the dlt-viewer settings][https://github.com/svlad-90/DLT-Message-Analyzer/issues/19]
 
 ----
 
@@ -59,6 +52,8 @@ There are the following schemas of deployment:
 
 ### [Read it here](./md/installation_guide/installation_guide.md)
 
+**Important note!** As an alternative to 'building from source', you can download the prebuilt dlt-viewer with the integrated DLT-Message-Analyzer plugin in the [packages](https://github.com/svlad-90?tab=packages&repo_name=DLT-Message-Analyzer) section. Currently, it is supported only for the Windows OS.
+
 ----
 
 ## Feature-set:
diff --git a/dltmessageanalyzerplugin/src/common/Definitions.hpp b/dltmessageanalyzerplugin/src/common/Definitions.hpp
@@ -6,6 +6,8 @@
 #ifndef DEFINITIONS_HPP
 #define DEFINITIONS_HPP
 
+#include <cstdint>
+
 #include <list>
 #include <set>
 
diff --git a/dltmessageanalyzerplugin/src/components/logsWrapper/src/CDLTFileWrapper.cpp b/dltmessageanalyzerplugin/src/components/logsWrapper/src/CDLTFileWrapper.cpp
@@ -841,7 +841,6 @@ bool CDLTFileWrapper::CSubFilesHandler::CDLTFileItem::updateIndex()
             int counter_header = 0;
             quint16 message_length = 0;
             qint64 file_size = mInfile.size();
-            qint64 errors_in_file  = 0;
 
             while(true)
             {
@@ -932,11 +931,6 @@ bool CDLTFileWrapper::CSubFilesHandler::CDLTFileItem::updateIndex()
                                 storageLength = 16;
                             else
                                 storageLength = 13;
-                            if(current_message_pos!=0)
-                            {
-                                // first messages not at beginning or error occured before
-                                errors_in_file++;
-                            }
                             // speed up move directly to message length, if inside current buffer
                             if(num+9<cbuf_sz)
                             {
diff --git a/dltmessageanalyzerplugin/src/components/logsWrapper/src/CDLTMsgWrapper.cpp b/dltmessageanalyzerplugin/src/components/logsWrapper/src/CDLTMsgWrapper.cpp
diff --git a/dltmessageanalyzerplugin/src/components/plant_uml/src/CUMLView.cpp b/dltmessageanalyzerplugin/src/components/plant_uml/src/CUMLView.cpp
diff --git a/dltmessageanalyzerplugin/src/dltmessageanalyzerplugin.hpp b/dltmessageanalyzerplugin/src/dltmessageanalyzerplugin.hpp
diff --git a/md/installation_guide/installation_guide.md b/md/installation_guide/installation_guide.md
