Control: tags -1 moreinfo confirmed On 2021-03-27 10:32:44, Gianfranco Costamagna wrote: > Package: release.debian.org > User: release.debian....@packages.debian.org > Usertags: unblock > Severity: normal > > Please unblock package dlt-viewer > > [ Reason ] > There is a bug in current dlt-viewer UDP reception code, due to a swap > of two assigments into the main function. > > [ Impact ] > They might have that disabled. > > [ Tests ] > I did manual testing with the dlt I use everyday > > [ Risks ] > The new upstream release is about yaml files and windows only affected > changes, except for this bugfix. > When bumping compat level to 13, I also found that some png images were > not installed, but mentioned in rc file, so I added them to the shared > directory.
Seems fine without the compat bump. Cheers > > [ Checklist ] > [x] all changes are documented in the d/changelog > [x] I reviewed all changes and I approve them > [x] attach debdiff against the package in testing > > [ Other info ] > This is a leaf package, but I hope the new release can go into stable. > The diff looks a little bit big, but the only change in the code that > affects linux systems is here: > https://github.com/GENIVI/dlt-viewer/commit/6b336eed42c61f9589e4211ca4c020e706cc026a.patch > > unblock dlt-viewer/2.21.2+dfsg-1 > diff -Nru dlt-viewer-2.21.1+dfsg/appveyor.yml > dlt-viewer-2.21.2+dfsg/appveyor.yml > --- dlt-viewer-2.21.1+dfsg/appveyor.yml 2021-01-18 11:14:23.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/appveyor.yml 1970-01-01 01:00:00.000000000 > +0100 > @@ -1,15 +0,0 @@ > -version: 2.19.0.{build} > -image: Visual Studio 2017 > -install: > - - set QTDIR=C:\Qt\5.12\msvc2017_64 > - - set MSVC_DIR=C:\Program Files (x86)\Microsoft Visual > Studio\2017\Community\VC\Auxiliary\Build > - - set PATH=%PATH%;%QTDIR%\bin;%MSVC_DIR% > - - set ARCHITECTURE=x86_amd64 > -build_script: > - - call vcvarsall.bat %ARCHITECTURE% > - - dir > - - mkdir build > - - cd build > - - qmake ../BuildDltViewer.pro > - - nmake > -test: off > diff -Nru dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat > dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat > --- dlt-viewer-2.21.1+dfsg/build_parser_windows_qt5_MSVC.bat 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/build_parser_windows_qt5_MSVC.bat 2021-03-25 > 08:41:04.000000000 +0100 > @@ -46,12 +46,22 @@ > set PATH=%QTDIR%\bin;%MSVC_DIR%;%MSVC_DIR%\bin;%PATH% > set QTSDK=%QTDIR% > > -IF "%DLT_PARSER_DIR%"=="" ( > +if '%WORKSPACE%'=='' ( > + if '%DLT_PARSER_DIR%'=='' ( > set DLT_PARSER_DIR=c:\DltParser > + ) > + > + set SOURCE_DIR=%CD% > + set BUILD_DIR=%CD%\build\release > +) else ( > + if '%DLT_PARSER_DIR%'=='' ( > + set DLT_PARSER_DIR=%WORKSPACE%\build\dist\DltParser > + ) > + > + set SOURCE_DIR=%WORKSPACE% > + set BUILD_DIR=%WORKSPACE%\build\release > ) > > -set SOURCE_DIR=%CD% > -set BUILD_DIR=%CD%\build\release > > echo ************************************ > echo * QTDIR = %QTDIR% > @@ -118,24 +128,6 @@ > IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > > echo *** Copy files *** > -rem copy %QTDIR%\bin\icuin54.dll %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > - > -rem copy %QTDIR%\bin\icuuc54.dll %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > - > -rem copy %QTDIR%\bin\icudt54.dll %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > - > -rem copy %QTDIR%\bin\libwinpthread-1.dll %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > -rem > -rem copy %QTDIR%\bin\libgcc_s_dw2-1.dll %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > -rem > -rem copy "%QTDIR%\bin\libstdc++-6.dll" %DLT_PARSER_DIR% > -rem IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > - > copy %QTDIR%\bin\Qt5Core.dll %DLT_PARSER_DIR% > IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > > diff -Nru dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat > dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat > --- dlt-viewer-2.21.1+dfsg/build_qwt_windows_qt5_MSVC.bat 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/build_qwt_windows_qt5_MSVC.bat 2021-03-25 > 08:41:04.000000000 +0100 > @@ -6,7 +6,6 @@ > REM 4.7.19 1.1 Alexander Wenzel Update to Qt 5.12.4, Qwt 6.1.4 > and Visual Studio 2015 > REM 25.11.20 1.2 Alexander Wenzel Update to Qt 5.12.10 > > - > echo ************************************ > echo *** Build QWT Library *** > echo ************************************ > @@ -15,7 +14,6 @@ > echo *** Configuration *** > echo ************************************ > > - > if "%MSVC_VERSION%"=="" ( > echo "Set default MSVCS "" > set MSVC_VERSION=2015 > @@ -44,12 +42,11 @@ > > echo *** Setting up environment *** > > -echo Set QT path for %QTVER% > - > IF "%QTVER%"=="" ( > set QTVER=5.12.10 > ) > > +echo Set QT path for %QTVER% > echo Set QT diretory for %ARCHITECTURE% > > if "%QTDIR%"=="" ( > @@ -71,13 +68,19 @@ > set QWT=6.1.4 > ) > > -set QWT_DIR=C:\Qwt-%QWT%_%MSVC_VERSION%_%QTVER%%DIR_POSTFIX% > - > set PATH=%QTDIR%\bin;%MSVC_DIR%;%MSVC_DIR%\bin;%PATH% > > -IF "%WORKSPACE%" == "" ( > +if '%WORKSPACE%'=='' ( > + IF "%QWT_DIR%"=="" ( > + set QWT_DIR=C:\Qwt-%QWT%_%MSVC_VERSION%_%QTVER%%DIR_POSTFIX% > + ) > + > set SOURCE_DIR=%CD%\qwt-%QWT% > -) ELSE ( > +) else ( > + if '%QWT_DIR%'=='' ( > + set QWT_DIR=%WORKSPACE%\Qwt-%QWT%_%MSVC_VERSION%_%QTVER%%DIR_POSTFIX% > + ) > + > set SOURCE_DIR=%WORKSPACE%\qwt-%QWT% > ) > > @@ -85,20 +88,11 @@ > set SEVENZ_DIR="C:\Program Files\7-Zip" > ) > > -IF exist %QWT_DIR% ( > -echo ************************************ > -echo *** Delete old qwt Directory *** > -echo ************************************ > - > - rmdir /s /q %QWT_DIR% > - IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > -) > - > echo ************************************ > echo * QTDIR = %QTDIR% > echo * MSVC_DIR = %MSVC_DIR% > echo * PATH = %PATH% > -echo * DLT_VIEWER_SDK_DIR = %DLT_VIEWER_SDK_DIR% > +echo * QWT_DIR = %QWT_DIR% > echo * SOURCE_DIR = %SOURCE_DIR% > echo ************************************ > > @@ -109,6 +103,15 @@ > GOTO ERROR_HANDLER > ) > > +IF exist %QWT_DIR% ( > +echo ************************************ > +echo *** Delete old qwt Directory *** > +echo ************************************ > + > + rmdir /s /q %QWT_DIR% > + IF %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > +) > + > echo ************************************ > echo *** Unzip Archives *** > echo ************************************ > @@ -162,8 +165,9 @@ > echo #################################### > cd %WORKINGDIR% > IF '%WORKSPACE%'=='' ( > -pause > + pause > ) > +exit 1 > > > :QUIT > @@ -173,6 +177,6 @@ > echo Qwt installed in: %QWT_DIR% > cd %WORKINGDIR% > IF '%WORKSPACE%'=='' ( > -pause > + pause > ) > > diff -Nru dlt-viewer-2.21.1+dfsg/build_sdk_windows_qt5_MSVC.bat > dlt-viewer-2.21.2+dfsg/build_sdk_windows_qt5_MSVC.bat > --- dlt-viewer-2.21.1+dfsg/build_sdk_windows_qt5_MSVC.bat 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/build_sdk_windows_qt5_MSVC.bat 2021-03-25 > 08:41:04.000000000 +0100 > @@ -52,7 +52,7 @@ > set BUILD_DIR=%CD%\build\release > ) else ( > if '%DLT_VIEWER_SDK_DIR%'=='' ( > - set DLT_VIEWER_SDK_DIR=%WORKSPACE%\DltViewerSDK > + set DLT_VIEWER_SDK_DIR=%WORKSPACE%\build\dist\DltViewerSDK > ) > > set SOURCE_DIR=%WORKSPACE% > @@ -280,26 +280,20 @@ > copy %SOURCE_DIR%\filters\* %DLT_VIEWER_SDK_DIR%\filters > if %ERRORLEVEL% NEQ 0 GOTO ERROR_HANDLER > > - > GOTO QUIT > > :ERROR_HANDLER > echo #################################### > echo ### ERROR occured ### > echo #################################### > -cd .. > -if '%WORKSPACE%'=='' ( > -pause > -) > -rem exit 1 > +set /p name= Continue > +exit 1 > + > > :QUIT > echo ************************************ > echo *** SUCCESS finish *** > echo ************************************ > -cd .. > echo SDK installed in: %DLT_VIEWER_SDK_DIR% > -if '%WORKSPACE%'=='' ( > -pause > -) > -rem exit 0 > +set /p name= Continue > +exit 0 > diff -Nru dlt-viewer-2.21.1+dfsg/.ci/travis/build.sh > dlt-viewer-2.21.2+dfsg/.ci/travis/build.sh > --- dlt-viewer-2.21.1+dfsg/.ci/travis/build.sh 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.ci/travis/build.sh 1970-01-01 > 01:00:00.000000000 +0100 > @@ -1,19 +0,0 @@ > -#!/bin/bash > - > -if [[ "$(uname -s)" == 'Darwin' ]]; then > - readonly Qt5_DIR="/usr/local/opt/qt" > -fi > - > -mkdir build > -cd build > - > -# Building with CMake > -cmake ../ > -make > - > -# Cleanup > -rm -rf * > - > -# Building with QMake > -qmake ../BuildDltViewer.pro > -make > diff -Nru dlt-viewer-2.21.1+dfsg/.ci/travis/install.sh > dlt-viewer-2.21.2+dfsg/.ci/travis/install.sh > --- dlt-viewer-2.21.1+dfsg/.ci/travis/install.sh 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.ci/travis/install.sh 1970-01-01 > 01:00:00.000000000 +0100 > @@ -1,8 +0,0 @@ > -#!/bin/bash > - > -if [[ "$(uname -s)" == 'Darwin' ]]; then > - brew link qt --force > -else > - sudo apt-get update > - sudo apt-get install -y build-essential qt5-default libqt5serialport5-dev > -fi > diff -Nru dlt-viewer-2.21.1+dfsg/debian/changelog > dlt-viewer-2.21.2+dfsg/debian/changelog > --- dlt-viewer-2.21.1+dfsg/debian/changelog 2021-01-30 13:35:57.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/debian/changelog 2021-03-27 09:29:15.000000000 > +0100 > @@ -1,3 +1,12 @@ > +dlt-viewer (2.21.2+dfsg-1) unstable; urgency=medium > + > + * New upstream version 2.21.2+dfsg > + * Add R^3: no > + * Bump compat level to 13 > + * Also install upstream png icons > + > + -- Gianfranco Costamagna <locutusofb...@debian.org> Sat, 27 Mar 2021 > 09:29:15 +0100 > + > dlt-viewer (2.21.1+dfsg-1) unstable; urgency=medium > > [ Debian Janitor ] > diff -Nru dlt-viewer-2.21.1+dfsg/debian/control > dlt-viewer-2.21.2+dfsg/debian/control > --- dlt-viewer-2.21.1+dfsg/debian/control 2021-01-30 13:34:29.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/debian/control 2021-03-27 09:29:15.000000000 > +0100 > @@ -5,7 +5,7 @@ > Uploaders: Bruno "Fuddl" Kleinert <fu...@debian.org>, > Aigars Mahinovs <aigar...@debian.org>, > Gianfranco Costamagna <locutusofb...@debian.org> > -Build-Depends: debhelper-compat (= 12), > +Build-Depends: debhelper-compat (= 13), > qtbase5-dev, > qtdeclarative5-dev, > libqt5serialport5-dev, > @@ -13,6 +13,7 @@ > asciidoc, > dblatex > Standards-Version: 4.5.0 > +Rules-Requires-Root: no > Homepage: > https://at.projects.genivi.org/wiki/display/PROJ/Diagnostic+Log+and+Trace > Vcs-Browser: https://salsa.debian.org/sistpoty-guest-guest/dlt-viewer > Vcs-Git: https://salsa.debian.org/sistpoty-guest-guest/dlt-viewer.git > diff -Nru dlt-viewer-2.21.1+dfsg/debian/dlt-viewer-dev.install > dlt-viewer-2.21.2+dfsg/debian/dlt-viewer-dev.install > --- dlt-viewer-2.21.1+dfsg/debian/dlt-viewer-dev.install 2021-01-30 > 13:33:30.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/debian/dlt-viewer-dev.install 2021-03-27 > 09:29:15.000000000 +0100 > @@ -1,4 +1,4 @@ > -debian/tmp/usr/lib/*/*.a > +usr/lib/*/*.a > qdlt/plugininterface.h /usr/include > qdlt/qdltbase.h /usr/include > qdlt/qdltargument.h /usr/include > diff -Nru dlt-viewer-2.21.1+dfsg/debian/dlt-viewer.install > dlt-viewer-2.21.2+dfsg/debian/dlt-viewer.install > --- dlt-viewer-2.21.1+dfsg/debian/dlt-viewer.install 2021-01-30 > 13:34:22.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/debian/dlt-viewer.install 2021-03-27 > 09:29:15.000000000 +0100 > @@ -1,4 +1,5 @@ > -debian/tmp/usr/bin/* > -debian/tmp/usr/lib/*/dlt-viewer/plugins/*.so > +usr/bin/* > +usr/lib/*/dlt-viewer/plugins/*.so > +usr/share/dlt-viewer > src/org.genivi.DLTViewer.desktop /usr/share/applications > src/icon/256x256/org.genivi.DLTViewer.png /usr/share/pixmaps > diff -Nru dlt-viewer-2.21.1+dfsg/debian/patches/02_remove_rpath.patch > dlt-viewer-2.21.2+dfsg/debian/patches/02_remove_rpath.patch > --- dlt-viewer-2.21.1+dfsg/debian/patches/02_remove_rpath.patch > 2021-01-30 13:34:07.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/debian/patches/02_remove_rpath.patch > 2021-03-27 09:29:15.000000000 +0100 > @@ -2,7 +2,7 @@ > Make the usage of RPATH settings to detect non-standard QT > installations optional. > Author: Stefan Potyra <ste...@potyra.de> > -Forwarded: no > +Forwarded: https://github.com/GENIVI/dlt-viewer/pull/192 > --- dlt-viewer-2.19.0+dfsg.orig/CMakeLists.txt > +++ dlt-viewer-2.19.0+dfsg/CMakeLists.txt > @@ -43,10 +43,14 @@ set (CMAKE_AUTOUIC ON) > diff -Nru dlt-viewer-2.21.1+dfsg/doc/dlt_viewer_user_manual.tex > dlt-viewer-2.21.2+dfsg/doc/dlt_viewer_user_manual.tex > --- dlt-viewer-2.21.1+dfsg/doc/dlt_viewer_user_manual.tex 2021-01-18 > 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/doc/dlt_viewer_user_manual.tex 2021-03-25 > 08:41:04.000000000 +0100 > @@ -1730,7 +1730,7 @@ > dlt\_viewer -h ( Linux ) or dlt\_viewer.exe -h ( Windows ) > > \footnotesize\begin{verbatim} > -Usage: dlt_viewer [OPTIONS] > +Usage: dlt-viewer [OPTIONS] > Options: > -h Print usage > -p projectfile Loading project file on startup (must end with .dlp) > @@ -1746,13 +1746,13 @@ > -e "plugin|command|param1|..|param<n>" Execute a plugin command > with <n> parameters. > > Examples: > - dlt_viewer -c ./traces/trace.dlt ./trace.txt > - dlt_viewer -s -c -u ./trace/trace.dlt ./trace.txt > - dlt_viewer -s -d -c ./trace/trace.dlt ./trace.dlt > - dlt_viewer -s -p ./proj/decodeded.dlp -dd -c ./trace/trace.dlt ./trace.dlt > - dlt_viewer -s -csv -c ./trace/trace.dlt ./trace.csv > - dlt_viewer -s -d -f ./filter/filter.dlf -c ./trace/trace.dlt > ./filteredtrace.dlt > - dlt_viewer -p ./proj/export.dlp -l ./trace/trace.dlt -e "Filetransfer > Plugin|export|./ftransferdir" > + dlt-viewer -c ./traces/trace.dlt ./trace.txt > + dlt-viewer -s -c -u ./trace/trace.dlt ./trace.txt > + dlt-viewer -s -d -c ./trace/trace.dlt ./trace.dlt > + dlt-viewer -s -p ./proj/decodeded.dlp -dd -c ./trace/trace.dlt ./trace.dlt > + dlt-viewer -s -csv -c ./trace/trace.dlt ./trace.csv > + dlt-viewer -s -d -f ./filter/filter.dlf -c ./trace/trace.dlt > ./filteredtrace.dlt > + dlt-viewer -p ./proj/export.dlp -l ./trace/trace.dlt -e "Filetransfer > Plugin|export|./ftransferdir" > \end{verbatim} > \normalsize > > @@ -1765,9 +1765,9 @@ > Example output: > > \begin{verbatim} > -C:\01-viewer\r690>dlt_viewer.exe -s > +C:\01-viewer\r690>dlt-viewer.exe -s > Enable silent mode > -Start "dlt_viewer.exe" > +Start "dlt-viewer.exe" > Build time Jun 15 2018 09:24:40 > Version 2.19.0 WORKING > ********************************************************** > @@ -1818,55 +1818,55 @@ > > \paragraph{Command line start of GUI with dedicated logfile} > \begin{verbatim} > -dlt_viewer -l ./example.dlt > +dlt-viewer -l ./example.dlt > \end{verbatim} > > \paragraph{Command line start of GUI with dedicated logfile and filterfile} > \begin{verbatim} > -dlt_viewer -l ./example.dlt -f ./filter.dlf > +dlt-viewer -l ./example.dlt -f ./filter.dlf > \end{verbatim} > > > \paragraph{Convert to ASCII file} > \begin{verbatim} > -dlt_viewer -c ./example.dlt ./example.txt > +dlt-viewer -c ./example.dlt ./example.txt > \end{verbatim} > > \paragraph{Convert to UTF8 file} > \begin{verbatim} > -dlt_viewer -u -c ./example.dlt ./example.txt > +dlt-viewer -u -c ./example.dlt ./example.txt > \end{verbatim} > > > \paragraph{Convert to ASCII file in silent mode} > \begin{verbatim} > -dlt_viewer -s -c ./example.dlt ./example.txt > +dlt-viewer -s -c ./example.dlt ./example.txt > \end{verbatim} > > \paragraph{Filter and convert to ASCII file} > \begin{verbatim} > -dlt_viewer -f /viewertests/filterfiles/export.dlf -c ./example.dlt > ./example.txt > +dlt-viewer -f /viewertests/filterfiles/export.dlf -c ./example.dlt > ./example.txt > \end{verbatim} > > \paragraph{Filter, decode and convert to ASCII file} > \begin{verbatim} > -dlt_viewer -p /viewertests/filterfiles/example.dlp -c ./example.dlt > ./example.txt > +dlt-viewer -p /viewertests/filterfiles/example.dlp -c ./example.dlt > ./example.txt > \end{verbatim} > > > \paragraph{Filter and save as DLT file} > \begin{verbatim} > -dlt_viewer -s -d -f /filterfiles/filter.dlf -c ./example.dlt > ./example_filtered.dlt > +dlt-viewer -s -d -f /filterfiles/filter.dlf -c ./example.dlt > ./example_filtered.dlt > \end{verbatim} > > \paragraph{Filter, decode and save as DLT file} > \begin{verbatim} > -dlt_viewer -s -dd -f /project/example.dlp -c ./example.dlt > ./example_decoded.dlt > +dlt-viewer -s -dd -f /project/example.dlp -c ./example.dlt > ./example_decoded.dlt > \end{verbatim} > > \paragraph{Decode and save as DLT file} > \begin{verbatim} > -dlt_viewer -p ./export.dlp -l ./filetransfer.dlt -e "Filetransfer > Plugin|export|./ft_dir" > +dlt-viewer -p ./export.dlp -l ./filetransfer.dlt -e "Filetransfer > Plugin|export|./ft_dir" > \end{verbatim} > > \subsubsection{Shell script examples of command line calls} > @@ -1880,7 +1880,7 @@ > #!/bin/bash > for files in `ls *.dlt` > do > - dlt_viewer -s -f ./dltfilters/Filter_v5.dlf -c $files > ${files}_filtered.txt > + dlt-viewer -s -f ./dltfilters/Filter_v5.dlf -c $files > ${files}_filtered.txt > done > \end{verbatim} > > diff -Nru dlt-viewer-2.21.1+dfsg/.github/dependabot.yml > dlt-viewer-2.21.2+dfsg/.github/dependabot.yml > --- dlt-viewer-2.21.1+dfsg/.github/dependabot.yml 1970-01-01 > 01:00:00.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.github/dependabot.yml 2021-03-25 > 08:41:04.000000000 +0100 > @@ -0,0 +1,11 @@ > +# To get started with Dependabot version updates, you'll need to specify > which > +# package ecosystems to update and where the package manifests are located. > +# Please see the documentation for all configuration options: > +# > https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates > + > +version: 2 > +updates: > + - package-ecosystem: "github-actions" > + directory: "/" # Location of package manifests > + schedule: > + interval: "weekly" > diff -Nru dlt-viewer-2.21.1+dfsg/.github/workflows/BuildPR.yml > dlt-viewer-2.21.2+dfsg/.github/workflows/BuildPR.yml > --- dlt-viewer-2.21.1+dfsg/.github/workflows/BuildPR.yml 1970-01-01 > 01:00:00.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.github/workflows/BuildPR.yml 2021-03-25 > 08:41:04.000000000 +0100 > @@ -0,0 +1,89 @@ > +name: PullRequest > + > +on: > + push: > + branches: > + - master > + pull_request: > + branches: > + - master > + > +jobs: > + buildMac: > + name: Build macOS > + runs-on: macOS-latest > + strategy: > + matrix: > + xcode: [Xcode_12.2, Xcode_12.3, Xcode_11.7] > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: Investigate available XCode versions > + run: ls -n /Applications/ | grep Xcode* > + - name: Set XCode Version > + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app > + - name: install qt 5 > + run: brew install qt@5 > + - name: install build environment > + run: scripts/install.sh > + - name: Build project > + run: scripts/build.sh > + - name: Archive artifact > + uses: actions/upload-artifact@v2.2.2 > + if: ${{ success() }} > + with: > + name: DLT-macOS-${{ matrix.xcode }} > + path: build/release > + > + buildLinux: > + name: Build ${{ matrix.ubuntu }} > + strategy: > + matrix: > + ubuntu: [ubuntu-18.04, ubuntu-20.04] > + runs-on: ${{ matrix.ubuntu }} > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: install build environment > + run: scripts/install.sh > + - name: Build project > + run: scripts/build.sh > + - name: Make artifact executable > + run: chmod -R +x build/release > + - name: Archive artifact > + uses: actions/upload-artifact@v2.2.2 > + if: ${{ success() }} > + with: > + name: DLT-${{ matrix.ubuntu }} > + path: build/release > + > + buildWindows: > + name: Build Windows > + strategy: > + matrix: > + task: [parser, sdk] > + runs-on: windows-2019 > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: Install qt > + uses: jurplel/install-qt-action@v2 > + with: > + version: 5.12.10 > + - name: Build ${{ matrix.task }} > + run: $env:WORKSPACE=$env:GITHUB_WORKSPACE; > $env:QTDIR=$env:Qt5_DIR.Replace('/','\'); ./build_${{ matrix.task > }}_windows_qt5_MSVC.bat > + - name: Archive artifact > + uses: actions/upload-artifact@v2.2.2 > + if: ${{ success() }} > + with: > + name: DLT-Windows-${{ matrix.task }} > + path: build/dist > diff -Nru dlt-viewer-2.21.1+dfsg/.github/workflows/Release.yml > dlt-viewer-2.21.2+dfsg/.github/workflows/Release.yml > --- dlt-viewer-2.21.1+dfsg/.github/workflows/Release.yml 1970-01-01 > 01:00:00.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.github/workflows/Release.yml 2021-03-25 > 08:41:04.000000000 +0100 > @@ -0,0 +1,117 @@ > +name: Release > + > +on: > + push: > + tags: > + - '*' > + > +jobs: > + buildMac: > + name: Build macOS > + runs-on: macOS-latest > + strategy: > + matrix: > + xcode: [ Xcode_12.2 ] > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: Investigate available XCode versions > + run: ls -n /Applications/ | grep Xcode* > + - name: Set XCode Version > + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app > + - name: install qt 5 > + run: brew install qt@5 > + - name: install build environment > + run: scripts/install.sh > + - name: Build project > + run: scripts/build.sh > + - name: Archive artifact > + run: zip DLT-macOS.zip -r build/release > + - name: Upload DLT artifact > + uses: actions/upload-artifact@v2 > + with: > + name: DLT-Mac > + path: DLT-macOS.zip > + > + buildLinux: > + name: Build ${{ matrix.ubuntu }} > + strategy: > + matrix: > + ubuntu: [ ubuntu-20.04 ] > + runs-on: ${{ matrix.ubuntu }} > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: install build environment > + run: scripts/install.sh > + - name: Build project > + run: scripts/build.sh > + - name: Make artifact executable > + run: chmod -R +x build/release > + - name: Archive artifact > + run: zip DLT-Linux.zip -r build/release > + - name: Upload DLT artifact > + uses: actions/upload-artifact@v2 > + with: > + name: DLT-Linux > + path: DLT-Linux.zip > + > + buildWindows: > + name: Build Windows > + strategy: > + matrix: > + task: [ parser, sdk ] > + runs-on: windows-2019 > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: Install qt > + uses: jurplel/install-qt-action@v2 > + with: > + mirror: http://ftp.fau.de/qtproject/ > + version: 5.12.10 > + - name: Build ${{ matrix.task }} > + run: $env:WORKSPACE=$env:GITHUB_WORKSPACE; > $env:QTDIR=$env:Qt5_DIR.Replace('/','\'); ./build_${{ matrix.task > }}_windows_qt5_MSVC.bat > + - name: Archive artifact > + run: Compress-Archive -Path .\build\dist -DestinationPath > DLT-Windows-${{ matrix.task }}.zip > + - name: Upload DLT artifact > + uses: actions/upload-artifact@v2 > + with: > + name: DLT-Windows-${{ matrix.task }} > + path: DLT-*.zip > + > + createRelease: > + name: Create release > + runs-on: ubuntu-20.04 > + needs: [ buildMac, buildLinux, buildWindows ] > + steps: > + - name: Checkout > + uses: actions/checkout@v2.3.4 > + with: > + fetch-depth: 0 > + submodules: true > + - name: Download DLT Linux artifacts > + uses: actions/download-artifact@v2 > + with: > + name: DLT-Linux > + - name: Download DLT macOS artifacts > + uses: actions/download-artifact@v2 > + with: > + name: DLT-Mac > + - run: | > + assetsZip=$(find . -name 'DLT*.zip' | while read -r asset ; do > echo "-a $asset" ; done) > + VERSION=$(echo $VERSION | cut -d'/' -f3) > + tag_name="${GITHUB_REF##*/}" > + hub release create ${assetsZip} -m "$tag_name" "$tag_name" > + env: > + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} > + VERSION: ${{ github.ref }} > \ No newline at end of file > diff -Nru dlt-viewer-2.21.1+dfsg/.gitignore dlt-viewer-2.21.2+dfsg/.gitignore > --- dlt-viewer-2.21.1+dfsg/.gitignore 2021-01-18 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/.gitignore 2021-03-25 08:41:04.000000000 +0100 > @@ -11,4 +11,5 @@ > .settings > *.orig > *~ > +.idea > > diff -Nru dlt-viewer-2.21.1+dfsg/README.md dlt-viewer-2.21.2+dfsg/README.md > --- dlt-viewer-2.21.1+dfsg/README.md 2021-01-18 11:14:23.000000000 +0100 > +++ dlt-viewer-2.21.2+dfsg/README.md 2021-03-25 08:41:04.000000000 +0100 > @@ -1,5 +1,4 @@ > # Diagnostic Log and Trace Viewer > -Build and Test status: [](https://travis-ci.org/GENIVI/dlt-viewer) > ## Overview > > The Diagnostic Log and Trace Viewer is an application that can send and > receive control messages to the DLT daemon, e.g. to set individual log levels > of applications and contexts or get the list of applications and contexts > registered in the DLT daemon. DLT viewer is based on Qt for Windows and Linux > and can run on the Mac though that is not officially supported. > diff -Nru dlt-viewer-2.21.1+dfsg/scripts/build.sh > dlt-viewer-2.21.2+dfsg/scripts/build.sh > --- dlt-viewer-2.21.1+dfsg/scripts/build.sh 1970-01-01 01:00:00.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/scripts/build.sh 2021-03-25 08:41:04.000000000 > +0100 > @@ -0,0 +1,19 @@ > +#!/bin/bash > + > +if [[ "$(uname -s)" == 'Darwin' ]]; then > + readonly Qt5_DIR="/usr/local/opt/qt" > +fi > + > +mkdir build > +cd build > + > +# Building with CMake > +cmake ../ > +make > + > +# Cleanup > +rm -rf * > + > +# Building with QMake > +qmake ../BuildDltViewer.pro > +make > diff -Nru dlt-viewer-2.21.1+dfsg/scripts/install.sh > dlt-viewer-2.21.2+dfsg/scripts/install.sh > --- dlt-viewer-2.21.1+dfsg/scripts/install.sh 1970-01-01 01:00:00.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/scripts/install.sh 2021-03-25 08:41:04.000000000 > +0100 > @@ -0,0 +1,8 @@ > +#!/bin/bash > + > +if [[ "$(uname -s)" == 'Darwin' ]]; then > + brew link qt@5 --force > +else > + sudo apt-get update > + sudo apt-get install -y build-essential qt5-default libqt5serialport5-dev > +fi > diff -Nru dlt-viewer-2.21.1+dfsg/src/main.cpp > dlt-viewer-2.21.2+dfsg/src/main.cpp > --- dlt-viewer-2.21.1+dfsg/src/main.cpp 2021-01-18 11:14:23.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/src/main.cpp 2021-03-25 08:41:04.000000000 > +0100 > @@ -27,13 +27,14 @@ > int main(int argc, char *argv[]) > { > > - QApplication a(argc, argv); > > #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) > QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); > QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); > #endif > > + QApplication a(argc, argv); > + > QStringList arguments = a.arguments(); > QDltOptManager *opt = QDltOptManager::getInstance(); > opt->parse(&arguments); > diff -Nru dlt-viewer-2.21.1+dfsg/src/mainwindow.cpp > dlt-viewer-2.21.2+dfsg/src/mainwindow.cpp > --- dlt-viewer-2.21.1+dfsg/src/mainwindow.cpp 2021-01-18 11:14:23.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/src/mainwindow.cpp 2021-03-25 08:41:04.000000000 > +0100 > @@ -3469,7 +3469,7 @@ > for(int num = 0; num < project.ecu->topLevelItemCount (); num++) > { > EcuItem *ecuitem = (EcuItem*)project.ecu->topLevelItem(num); > - if( ecuitem && (ecuitem->socket == sender() || > ecuitem->m_serialport == sender() || dltIndexer == sender() ) && ( true == > ecuitem->connected ) ) > + if( ecuitem && (ecuitem->socket == sender() || > ecuitem->m_serialport == sender() || dltIndexer == sender() ) && ( true == > ecuitem->connected || (ecuitem->interfacetype == EcuItem::INTERFACETYPE_UDP ) > ) ) > { > read(ecuitem); > } > diff -Nru dlt-viewer-2.21.1+dfsg/src/version.h > dlt-viewer-2.21.2+dfsg/src/version.h > --- dlt-viewer-2.21.1+dfsg/src/version.h 2021-01-18 11:14:23.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/src/version.h 2021-03-25 08:41:04.000000000 > +0100 > @@ -26,8 +26,8 @@ > #define PACKAGE_VERSION_STATE "release" > #define PACKAGE_MAJOR_VERSION "2" > #define PACKAGE_MINOR_VERSION "21" > -#define PACKAGE_PATCH_LEVEL "1" > -#define PACKAGE_VERSION "2.21.1" > +#define PACKAGE_PATCH_LEVEL "2" > +#define PACKAGE_VERSION "2.21.2" > #define PACKAGE_REVISION "" > #define DLT_SUPPORT_MAIL_ADDRESS > "genivi-diagnostic-log-and-tr...@lists.genivi.org" > #define DLT_SUPPORT_NAME "GENIVI" > diff -Nru dlt-viewer-2.21.1+dfsg/.travis.yml > dlt-viewer-2.21.2+dfsg/.travis.yml > --- dlt-viewer-2.21.1+dfsg/.travis.yml 2021-01-18 11:14:23.000000000 > +0100 > +++ dlt-viewer-2.21.2+dfsg/.travis.yml 1970-01-01 01:00:00.000000000 > +0100 > @@ -1,34 +0,0 @@ > -language: cpp > - > -linux: &linux > - os: linux > - services: > - - docker > - > -macos_high_sierra: &macos_high_sierra > - os: osx > - osx_image: xcode10.1 > - > -macos_mojave: &macos_mojave > - os: osx > - osx_image: xcode11.3.1 > - > -macos_mojave: &macos_BigSur > - os: osx > - osx_image: xcode12.2 > - > -jobs: > - include: > - - <<: *linux > - dist: xenial > - - <<: *linux > - dist: bionic > - - <<: *macos_high_sierra > - - <<: *macos_mojave > - - <<: *macos_BigSur > - > -install: > - - ./.ci/travis/install.sh > - > -script: > - - ./.ci/travis/build.sh -- Sebastian Ramacher
