Compare commits
13 Commits
8eff6e5d10
...
2.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d38cc1269 | |||
| f5baad16d5 | |||
| b35e6812aa | |||
| d7e709d997 | |||
| 4d93aa1392 | |||
| b0f1e0a493 | |||
| 0dffc1d1c2 | |||
| 3581dd4b1d | |||
| 8d2d7bbb15 | |||
| e2e7c0772d | |||
| 807cea1042 | |||
| 80712964ef | |||
| 978e98b2ee |
@@ -1,4 +0,0 @@
|
|||||||
TEMPLATE = subdirs
|
|
||||||
CONFIG += ordered
|
|
||||||
SUBDIRS = DownloadDCFirmware DownloadDCJsonFiles
|
|
||||||
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
QT += core
|
|
||||||
QT += serialport network
|
|
||||||
|
|
||||||
TARGET = ATBDownloadDCFirmware
|
|
||||||
|
|
||||||
VERSION="0.1.0"
|
|
||||||
win32 {
|
|
||||||
BUILD_DATE=$$system("date /t")
|
|
||||||
BUILD_TIME=$$system("time /t")
|
|
||||||
} else {
|
|
||||||
BUILD_DATE=$$system("date +%d-%m-%y")
|
|
||||||
BUILD_TIME=$$system("date +%H:%M:%S")
|
|
||||||
}
|
|
||||||
|
|
||||||
GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
|
|
||||||
|
|
||||||
EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
|
|
||||||
|
|
||||||
CONFIG += c++17
|
|
||||||
|
|
||||||
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
|
|
||||||
DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
|
|
||||||
DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
|
|
||||||
DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
|
||||||
|
|
||||||
# keep comments, as /* fall through */
|
|
||||||
QMAKE_CXXFLAGS += -C
|
|
||||||
QMAKE_CXXFLAGS += -g
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
|
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
CONFIG += link_pkgconfig
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
|
||||||
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
ARCH = PTU5
|
|
||||||
DEFINES+=PTU5
|
|
||||||
}
|
|
||||||
contains( CONFIG, PTU5_YOCTO ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
QMAKE_CXXFLAGS += -std=c++17 # for GCC >= 4.7
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
PTU5BASEPATH = /opt/devel/ptu5
|
|
||||||
ARCH = PTU5
|
|
||||||
DEFINES+=PTU5
|
|
||||||
|
|
||||||
# add qmqtt lib
|
|
||||||
#LIBS += -lQt5Qmqtt
|
|
||||||
}
|
|
||||||
contains( CONFIG, DesktopLinux ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): CONFIG += extserialport
|
|
||||||
# QMAKE_CC = ccache $$QMAKE_CC
|
|
||||||
# QMAKE_CXX = ccache $$QMAKE_CXX
|
|
||||||
QMAKE_CXXFLAGS += -std=c++17
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
|
||||||
ARCH = DesktopLinux
|
|
||||||
DEFINES+=DesktopLinux
|
|
||||||
}
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
main.cpp
|
|
||||||
|
|
||||||
# HEADERS +=
|
|
||||||
|
|
||||||
OTHER_FILES += \
|
|
||||||
ATBDownloadDCFirmware.ini
|
|
||||||
|
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
# for running program on target through QtCreator
|
|
||||||
contains( CONFIG, PTU5 ) {
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/app/tools/atbupdate/
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
#include <QtGlobal>
|
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
|
||||||
Q_UNUSED(argc);
|
|
||||||
Q_UNUSED(argv);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
QT += core
|
|
||||||
QT += serialport network
|
|
||||||
|
|
||||||
TARGET = ATBDownloadDCJsonFiles
|
|
||||||
|
|
||||||
VERSION="0.1.0"
|
|
||||||
win32 {
|
|
||||||
BUILD_DATE=$$system("date /t")
|
|
||||||
BUILD_TIME=$$system("time /t")
|
|
||||||
} else {
|
|
||||||
BUILD_DATE=$$system("date +%d-%m-%y")
|
|
||||||
BUILD_TIME=$$system("date +%H:%M:%S")
|
|
||||||
}
|
|
||||||
|
|
||||||
GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
|
|
||||||
|
|
||||||
EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
|
|
||||||
|
|
||||||
!contains(CONFIG, INCLUDEINTERFACES) {
|
|
||||||
INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
|
|
||||||
}
|
|
||||||
INCLUDEPATH += plugins $${INCLUDEINTERFACES}
|
|
||||||
|
|
||||||
CONFIG += c++17
|
|
||||||
|
|
||||||
DEFINES+=APP_VERSION=\\\"$$VERSION\\\"
|
|
||||||
DEFINES+=APP_BUILD_DATE=\\\"$$BUILD_DATE\\\"
|
|
||||||
DEFINES+=APP_BUILD_TIME=\\\"$$BUILD_TIME\\\"
|
|
||||||
DEFINES+=APP_EXTENDED_VERSION=\\\"$$EXTENDED_VERSION\\\"
|
|
||||||
|
|
||||||
# keep comments, as /* fall through */
|
|
||||||
QMAKE_CXXFLAGS += -C
|
|
||||||
QMAKE_CXXFLAGS += -g
|
|
||||||
QMAKE_CXXFLAGS += -Wno-deprecated-copy -O
|
|
||||||
|
|
||||||
contains( CONFIG, PTU5 ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
CONFIG += link_pkgconfig
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport
|
|
||||||
QMAKE_CXXFLAGS += -O2 -std=c++17 # for GCC >= 4.7
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
ARCH = PTU5
|
|
||||||
DEFINES+=PTU5
|
|
||||||
}
|
|
||||||
contains( CONFIG, PTU5_YOCTO ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
QMAKE_CXXFLAGS += -std=c++17 # for GCC >= 4.7
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
PTU5BASEPATH = /opt/devel/ptu5
|
|
||||||
ARCH = PTU5
|
|
||||||
DEFINES+=PTU5
|
|
||||||
|
|
||||||
# add qmqtt lib
|
|
||||||
#LIBS += -lQt5Qmqtt
|
|
||||||
}
|
|
||||||
contains( CONFIG, DesktopLinux ) {
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += serialport
|
|
||||||
lessThan(QT_MAJOR_VERSION, 5): CONFIG += extserialport
|
|
||||||
# QMAKE_CC = ccache $$QMAKE_CC
|
|
||||||
# QMAKE_CXX = ccache $$QMAKE_CXX
|
|
||||||
QMAKE_CXXFLAGS += -std=c++17
|
|
||||||
# QMAKE_CXXFLAGS += -Wno-deprecated-copy
|
|
||||||
linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments }
|
|
||||||
ARCH = DesktopLinux
|
|
||||||
DEFINES+=DesktopLinux
|
|
||||||
}
|
|
||||||
|
|
||||||
SOURCES += \
|
|
||||||
main.cpp \
|
|
||||||
message_handler.cpp \
|
|
||||||
process/command.cpp
|
|
||||||
|
|
||||||
HEADERS += \
|
|
||||||
message_handler.h \
|
|
||||||
plugins/interfaces.h \
|
|
||||||
process/command.h
|
|
||||||
|
|
||||||
OTHER_FILES += \
|
|
||||||
ATBDownloadDCJsonFiles.ini
|
|
||||||
|
|
||||||
|
|
||||||
##########################################################################################
|
|
||||||
# for running program on target through QtCreator
|
|
||||||
contains( CONFIG, PTU5 ) {
|
|
||||||
qnx: target.path = /tmp/$${TARGET}/bin
|
|
||||||
else: unix:!android: target.path = /opt/app/tools/atbupdate/
|
|
||||||
!isEmpty(target.path): INSTALLS += target
|
|
||||||
}
|
|
||||||
@@ -1,445 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE QtCreatorProject>
|
|
||||||
<!-- Written by QtCreator 5.0.2, 2024-02-28T16:01:22. -->
|
|
||||||
<qtcreator>
|
|
||||||
<data>
|
|
||||||
<variable>EnvironmentId</variable>
|
|
||||||
<value type="QByteArray">{6a494cc5-6dea-4681-86fc-d47b9761a1f4}</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
|
||||||
<value type="int">0</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.EditorSettings</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
|
|
||||||
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
|
|
||||||
<value type="QString" key="language">Cpp</value>
|
|
||||||
<valuemap type="QVariantMap" key="value">
|
|
||||||
<value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
|
|
||||||
<value type="QString" key="language">QmlJS</value>
|
|
||||||
<valuemap type="QVariantMap" key="value">
|
|
||||||
<value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
|
|
||||||
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
|
|
||||||
<value type="int" key="EditorConfiguration.IndentSize">4</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
|
|
||||||
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.MouseHiding">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
|
|
||||||
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.ShowMargin">false</value>
|
|
||||||
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
|
|
||||||
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
|
|
||||||
<value type="int" key="EditorConfiguration.TabSize">8</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.UseIndenter">false</value>
|
|
||||||
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
|
|
||||||
<value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
|
|
||||||
<value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.PluginSettings</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
|
|
||||||
<value type="bool" key="AutoTest.Framework.Boost">true</value>
|
|
||||||
<value type="bool" key="AutoTest.Framework.CTest">false</value>
|
|
||||||
<value type="bool" key="AutoTest.Framework.Catch">true</value>
|
|
||||||
<value type="bool" key="AutoTest.Framework.GTest">true</value>
|
|
||||||
<value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
|
|
||||||
<value type="bool" key="AutoTest.Framework.QtTest">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
|
|
||||||
<value type="int" key="AutoTest.RunAfterBuild">0</value>
|
|
||||||
<value type="bool" key="AutoTest.UseGlobal">true</value>
|
|
||||||
<valuemap type="QVariantMap" key="ClangTools">
|
|
||||||
<value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
|
|
||||||
<value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
|
|
||||||
<value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
|
|
||||||
<value type="int" key="ClangTools.ParallelJobs">3</value>
|
|
||||||
<valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
|
|
||||||
<valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
|
|
||||||
<valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
|
|
||||||
<value type="bool" key="ClangTools.UseGlobalSettings">true</value>
|
|
||||||
</valuemap>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<value type="QString" key="DeviceType">GenericLinuxOsType</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Yocto i.MX6-ATB-PTU5</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Yocto i.MX6-ATB-PTU5</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{804f60e1-6e88-41af-b072-9f5c6a606099}</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
|
||||||
<value type="int" key="EnableQmlDebugging">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Debug</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">CONFIG+=PTU5</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand">/usr/bin/make</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Release</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="int" key="QtQuickCompiler">0</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
|
||||||
<value type="int" key="EnableQmlDebugging">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Yocto_i_MX6_ATB_PTU5-Profile</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="int" key="QtQuickCompiler">0</value>
|
|
||||||
<value type="int" key="SeparateDebugInfo">0</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.CheckForFreeDiskSpaceStep</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
|
|
||||||
<value type="QString" key="RemoteLinux.CheckForFreeDiskSpaceStep.PathToCheck">/</value>
|
|
||||||
<value type="qlonglong" key="RemoteLinux.CheckForFreeDiskSpaceStep.RequiredSpace">5242880</value>
|
|
||||||
<valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
|
|
||||||
<valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinux.KillAppStep</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedFiles"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedHosts"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedRemotePaths"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.RunConfiguration.LastDeployedSysroots"/>
|
|
||||||
<valuelist type="QVariantList" key="RemoteLinux.LastDeployedLocalTimes"/>
|
|
||||||
<valuelist type="QVariantList" key="RemoteLinux.LastDeployedRemoteTimes"/>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
|
|
||||||
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToGenericLinux</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
|
||||||
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
|
|
||||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
|
||||||
<valuelist type="QVariantList" key="CustomOutputParsers"/>
|
|
||||||
<value type="int" key="PE.EnvironmentAspect.Base">1</value>
|
|
||||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">DownloadDCJsonFiles</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">RemoteLinuxRunConfiguration:/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/opt/ptu5/opt/DownloadDCJsonFiles/DownloadDCJsonFiles.pro</value>
|
|
||||||
<value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
|
||||||
<value type="QString" key="RunConfiguration.X11Forwarding">:0</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Target.1</variable>
|
|
||||||
<valuemap type="QVariantMap">
|
|
||||||
<value type="QString" key="DeviceType">Desktop</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.12 GCC 64bit</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.51212.gcc_64_kit</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
|
||||||
<value type="int" key="EnableQmlDebugging">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Debug</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Release</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="int" key="QtQuickCompiler">0</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
|
||||||
<value type="int" key="EnableQmlDebugging">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">/opt/ptu5/opt/build-DownloadDCJsonFiles-Desktop_Qt_5_12_12_GCC_64bit-Profile</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
|
||||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
|
||||||
<valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
|
|
||||||
</valuemap>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
|
||||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
|
|
||||||
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
|
|
||||||
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
|
|
||||||
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
|
|
||||||
<value type="int" key="QtQuickCompiler">0</value>
|
|
||||||
<value type="int" key="SeparateDebugInfo">0</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
|
||||||
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
|
|
||||||
<value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
|
|
||||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
|
|
||||||
<value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
|
|
||||||
<value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
|
|
||||||
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
|
|
||||||
<valuelist type="QVariantList" key="CustomOutputParsers"/>
|
|
||||||
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
|
|
||||||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
|
||||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
|
|
||||||
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
|
|
||||||
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
|
|
||||||
</valuemap>
|
|
||||||
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
|
|
||||||
</valuemap>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.TargetCount</variable>
|
|
||||||
<value type="int">2</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
|
|
||||||
<value type="int">22</value>
|
|
||||||
</data>
|
|
||||||
<data>
|
|
||||||
<variable>Version</variable>
|
|
||||||
<value type="int">22</value>
|
|
||||||
</data>
|
|
||||||
</qtcreator>
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
#include <QCoreApplication>
|
|
||||||
#include <QByteArray>
|
|
||||||
|
|
||||||
#include "message_handler.h"
|
|
||||||
#include "plugins/interfaces.h"
|
|
||||||
|
|
||||||
|
|
||||||
//#include <unistd.h>
|
|
||||||
//#include <errno.h>
|
|
||||||
|
|
||||||
#ifdef PTU5
|
|
||||||
#define SERIAL_PORT "ttymxc2"
|
|
||||||
#else
|
|
||||||
#define SERIAL_PORT "ttyUSB0"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
|
||||||
QByteArray const value = qgetenv("LC_ALL");
|
|
||||||
if (value != "C") {
|
|
||||||
qputenv("LC_ALL", "C");
|
|
||||||
}
|
|
||||||
// qputenv("XDG_RUNTIME_DIR", "/var/run/user/0");
|
|
||||||
|
|
||||||
openlog("ATB-DL-JSON", LOG_PERROR | LOG_PID | LOG_CONS, LOG_USER);
|
|
||||||
|
|
||||||
QCoreApplication a(argc, argv);
|
|
||||||
QCoreApplication::setApplicationName("ATBDownloadDCJsonFiles");
|
|
||||||
QCoreApplication::setApplicationVersion(APP_VERSION);
|
|
||||||
|
|
||||||
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
|
|
||||||
atbInstallMessageHandler(atbDebugOutput);
|
|
||||||
setDebugLevel(LOG_NOTICE);
|
|
||||||
}
|
|
||||||
|
|
||||||
int r = std::system("ls -l /proc/[0-9]*/fd/* 2>/dev/null | grep /dev/ttymxc2 > /tmp/slave-or-master.txt");
|
|
||||||
// lrwx------ 1 root root 64 Oct 31 14:55 /proc/884/fd/18 -> /dev/ttymxc2
|
|
||||||
|
|
||||||
//std::ifstream ifs("/tmp/slave-or-master.txt");
|
|
||||||
|
|
||||||
//if (ifs.is_open()) {
|
|
||||||
// std::string line;
|
|
||||||
// if (std::getline(ifs, line)) {
|
|
||||||
// if (line.size() > 0) {
|
|
||||||
// std::cout << "SLAVE " << line << std::endl;
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// }
|
|
||||||
|
|
||||||
// ifs.close();
|
|
||||||
|
|
||||||
//}
|
|
||||||
|
|
||||||
return a.exec();
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
#include "message_handler.h"
|
|
||||||
|
|
||||||
#include <QDateTime>
|
|
||||||
#include <cstring>
|
|
||||||
#include <QString>
|
|
||||||
#include <QFileInfo>
|
|
||||||
#include <QMessageLogContext>
|
|
||||||
|
|
||||||
|
|
||||||
static char const *DBG_NAME[] = { "DBG ", "WARN ", "CRIT ", "FATAL", "INFO " };
|
|
||||||
static bool installedMsgHandler = false;
|
|
||||||
static int debugLevel = LOG_NOTICE;
|
|
||||||
|
|
||||||
int getDebugLevel() { return debugLevel; }
|
|
||||||
void setDebugLevel(int newDebugLevel) {
|
|
||||||
debugLevel = newDebugLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool messageHandlerInstalled() {
|
|
||||||
return installedMsgHandler;
|
|
||||||
}
|
|
||||||
|
|
||||||
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
|
|
||||||
installedMsgHandler = (handler != 0);
|
|
||||||
static QtMessageHandler prevHandler = nullptr;
|
|
||||||
if (handler) {
|
|
||||||
prevHandler = qInstallMessageHandler(handler);
|
|
||||||
return prevHandler;
|
|
||||||
} else {
|
|
||||||
return qInstallMessageHandler(prevHandler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
///
|
|
||||||
/// \brief Print message according to given debug level.
|
|
||||||
///
|
|
||||||
/// \note Install this function using qInstallMsgHandler().
|
|
||||||
///
|
|
||||||
/// int main(int argc, char **argv) {
|
|
||||||
/// installMsgHandler(atbDebugOutput);
|
|
||||||
/// QApplication app(argc, argv);
|
|
||||||
/// ...
|
|
||||||
/// return app.exec();
|
|
||||||
/// }
|
|
||||||
///
|
|
||||||
#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
|
||||||
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
|
|
||||||
Q_UNUSED(context);
|
|
||||||
QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
|
|
||||||
|
|
||||||
switch (debugLevel) {
|
|
||||||
case LOG_DEBUG: { // debug-level message
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
} break;
|
|
||||||
case LOG_INFO: { // informational message
|
|
||||||
if (type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_NOTICE: { // normal, but significant, condition
|
|
||||||
if (type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_WARNING: { // warning conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_ERR: { // error conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_CRIT: { // critical conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_ALERT: { // action must be taken immediately
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_EMERG: { // system is unusable
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
default: {
|
|
||||||
//fprintf(stderr, "%s No ErrorLevel defined! %s\n",
|
|
||||||
// datetime.toStdString().c_str(), msg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#ifndef MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
#define MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
#ifdef __linux__
|
|
||||||
#include <syslog.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int getDebugLevel();
|
|
||||||
void setDebugLevel(int newDebugLevel);
|
|
||||||
|
|
||||||
bool messageHandlerInstalled();
|
|
||||||
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
|
||||||
// typedef void (*QtMessageHandler)(QtMsgType, const char *);
|
|
||||||
void atbDebugOutput(QtMsgType type, const char *msg);
|
|
||||||
#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
|
|
||||||
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
#ifndef COMMAND_H_INCLUDED
|
|
||||||
#define COMMAND_H_INCLUDED
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <QCoreApplication>
|
|
||||||
#include <QString>
|
|
||||||
#include <QStringList>
|
|
||||||
#include <QProcess>
|
|
||||||
|
|
||||||
|
|
||||||
class Command : public QObject {
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
QString m_command;
|
|
||||||
QString m_commandResult;
|
|
||||||
int m_waitForStartTimeout;
|
|
||||||
int m_waitForFinishTimeout;
|
|
||||||
int m_exitCode;
|
|
||||||
public:
|
|
||||||
explicit Command(QString const &command,
|
|
||||||
int start_timeout = 100000,
|
|
||||||
int finish_timeout = 100000);
|
|
||||||
|
|
||||||
QString getCommandResult() const;
|
|
||||||
QString command() const { return m_command; }
|
|
||||||
|
|
||||||
bool execute(QString workingDirectory, QStringList args = QStringList());
|
|
||||||
int exitCode() const { return m_exitCode; }
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void readyReadStandardOutput();
|
|
||||||
void readyReadStandardError();
|
|
||||||
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // COMMAND_H_INCLUDED
|
|
||||||
@@ -103,9 +103,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# Move final processing to subclass UpdateProcessRunning.
|
# Move final processing to subclass UpdateProcessRunning.
|
||||||
# Disable EXIT-button for the whole update-process, except for the
|
# Disable EXIT-button for the whole update-process, except for the
|
||||||
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
# checking of the ISMAS-trigger-button (aka WAIT-button).
|
||||||
# 1.4.1 : Sync files in the customer repository (under ./etc) as the very
|
# 2.0.0 Download device-controller using reporting-/download-thread.
|
||||||
# first step
|
VERSION="2.0.0"
|
||||||
VERSION="1.4.1"
|
|
||||||
# PLANNED TODOS:
|
# PLANNED TODOS:
|
||||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
@@ -119,6 +118,7 @@ VERSION="1.4.1"
|
|||||||
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
# ISMAS eine entsprechende Meldung anzeigen als Teil von SEND-LAST-VERSION.
|
||||||
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
# Wenn der WAIT-button aktiv ist, dann werden zumindest die opkg-commands
|
||||||
# ausgefuehrt.
|
# ausgefuehrt.
|
||||||
|
# 4: rsync: immer alle Dateien soiegeln (bis auf opkg-commands)
|
||||||
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
# 5: Falls das Tool mal abstuerzt, dann einen Signal-Handler (fuer TERM)
|
||||||
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
# installieren, sodass zumnidest SEND-LAST-VERSION mit rausgeht.
|
||||||
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
# 6: rsync: explizites Binary, nicht das in busybox enthaltene.
|
||||||
@@ -134,6 +134,9 @@ VERSION="1.4.1"
|
|||||||
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
# Stellung des WAIT-Button. Grund: es koennte sein, dass andernfalls ein
|
||||||
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
# PSA weit hiter anderen steht, und dann ploetzlich einmal alle vorher-
|
||||||
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
# gehenden Aenderungen anzieht, die gar nicht fuer ihn gemeint waren.
|
||||||
|
# 10: Bei einer Neuinstallation (Neuhauser) immer JSON files runterladen,
|
||||||
|
# Tariff-Files syncen (d.h. nur wenn noch kein Repo vorhanden ist), und
|
||||||
|
# zwar auch ohne WAIT-Button.
|
||||||
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
# 11: Das Edit-Fenster teilen um die Anzeige zu verbessern.
|
||||||
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
# 12: Bei einem Update muss immer ersichtlich sein, warum es ueberhaupt
|
||||||
# angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
|
# angestossen wurde. Steht kein "WAIT" im ISMAS-Trigger, dann kann man
|
||||||
@@ -174,7 +177,10 @@ GIT_COMMIT=$$system("git log -1 --format=oneline | cut -d' ' -f1")
|
|||||||
|
|
||||||
EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
|
EXTENDED_VERSION="$${VERSION}-$${GIT_COMMIT}"
|
||||||
|
|
||||||
INCLUDEPATH += plugins
|
!contains(CONFIG, INCLUDEINTERFACES) {
|
||||||
|
INCLUDEINTERFACES=/opt/ptu5/opt/DCLibraries/include
|
||||||
|
}
|
||||||
|
INCLUDEPATH += plugins $${INCLUDEINTERFACES}
|
||||||
|
|
||||||
CONFIG += c++17
|
CONFIG += c++17
|
||||||
# CONFIG -= app_bundle
|
# CONFIG -= app_bundle
|
||||||
@@ -247,9 +253,7 @@ HEADERS += \
|
|||||||
process/command.h \
|
process/command.h \
|
||||||
message_handler.h \
|
message_handler.h \
|
||||||
worker.h \
|
worker.h \
|
||||||
interfaces.h \
|
commandline_parser.h
|
||||||
commandline_parser.h \
|
|
||||||
plugins/interfaces.h
|
|
||||||
|
|
||||||
OTHER_FILES += \
|
OTHER_FILES += \
|
||||||
ATBUpdateTool.ini
|
ATBUpdateTool.ini
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
#include "message_handler.h"
|
|
||||||
|
|
||||||
#include <QDateTime>
|
|
||||||
#include <cstring>
|
|
||||||
#include <QString>
|
|
||||||
#include <QFileInfo>
|
|
||||||
#include <QMessageLogContext>
|
|
||||||
|
|
||||||
|
|
||||||
static char const *DBG_NAME[] = { "DBG ", "WARN ", "CRIT ", "FATAL", "INFO " };
|
|
||||||
static bool installedMsgHandler = false;
|
|
||||||
static int debugLevel = LOG_NOTICE;
|
|
||||||
|
|
||||||
int getDebugLevel() { return debugLevel; }
|
|
||||||
void setDebugLevel(int newDebugLevel) {
|
|
||||||
debugLevel = newDebugLevel;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool messageHandlerInstalled() {
|
|
||||||
return installedMsgHandler;
|
|
||||||
}
|
|
||||||
|
|
||||||
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler) {
|
|
||||||
installedMsgHandler = (handler != 0);
|
|
||||||
static QtMessageHandler prevHandler = nullptr;
|
|
||||||
if (handler) {
|
|
||||||
prevHandler = qInstallMessageHandler(handler);
|
|
||||||
return prevHandler;
|
|
||||||
} else {
|
|
||||||
return qInstallMessageHandler(prevHandler);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
///
|
|
||||||
/// \brief Print message according to given debug level.
|
|
||||||
///
|
|
||||||
/// \note Install this function using qInstallMsgHandler().
|
|
||||||
///
|
|
||||||
/// int main(int argc, char **argv) {
|
|
||||||
/// installMsgHandler(atbDebugOutput);
|
|
||||||
/// QApplication app(argc, argv);
|
|
||||||
/// ...
|
|
||||||
/// return app.exec();
|
|
||||||
/// }
|
|
||||||
///
|
|
||||||
#if (QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
|
||||||
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
|
|
||||||
Q_UNUSED(context);
|
|
||||||
QString const localMsg = QString(DBG_NAME[type]) + msg.toLocal8Bit();
|
|
||||||
|
|
||||||
switch (debugLevel) {
|
|
||||||
case LOG_DEBUG: { // debug-level message
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
} break;
|
|
||||||
case LOG_INFO: { // informational message
|
|
||||||
if (type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_NOTICE: { // normal, but significant, condition
|
|
||||||
if (type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_WARNING: { // warning conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_ERR: { // error conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_CRIT: { // critical conditions
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_ALERT: { // action must be taken immediately
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
case LOG_EMERG: { // system is unusable
|
|
||||||
if (type != QtInfoMsg && type != QtDebugMsg && type != QtWarningMsg) {
|
|
||||||
syslog(LOG_DEBUG, "%s", localMsg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
} break;
|
|
||||||
default: {
|
|
||||||
//fprintf(stderr, "%s No ErrorLevel defined! %s\n",
|
|
||||||
// datetime.toStdString().c_str(), msg.toStdString().c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
#ifndef MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
#define MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
|
|
||||||
#include <QtGlobal>
|
|
||||||
#ifdef __linux__
|
|
||||||
#include <syslog.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int getDebugLevel();
|
|
||||||
void setDebugLevel(int newDebugLevel);
|
|
||||||
|
|
||||||
bool messageHandlerInstalled();
|
|
||||||
QtMessageHandler atbInstallMessageHandler(QtMessageHandler handler);
|
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
|
|
||||||
// typedef void (*QtMessageHandler)(QtMsgType, const char *);
|
|
||||||
void atbDebugOutput(QtMsgType type, const char *msg);
|
|
||||||
#elif QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
|
|
||||||
// typedef void (*QtMessageHandler)(QtMsgType, const QMessageLogContext &, const QString &);
|
|
||||||
void atbDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // MESSAGE_HANDLER_H_INCLUDED
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,124 +0,0 @@
|
|||||||
#include "command.h"
|
|
||||||
|
|
||||||
#include <QProcess>
|
|
||||||
#include <QDebug>
|
|
||||||
#include <QDir>
|
|
||||||
#include <QRegularExpression>
|
|
||||||
#include <QDateTime>
|
|
||||||
|
|
||||||
Command::Command(QString const &command, int start_timeout, int finish_timeout)
|
|
||||||
: m_command(command.trimmed())
|
|
||||||
, m_commandResult("")
|
|
||||||
, m_waitForStartTimeout(start_timeout)
|
|
||||||
, m_waitForFinishTimeout(finish_timeout)
|
|
||||||
, m_exitCode(-1) {
|
|
||||||
}
|
|
||||||
|
|
||||||
QString Command::getCommandResult() const {
|
|
||||||
return m_commandResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Command::readyReadStandardOutput() {
|
|
||||||
QProcess *p = (QProcess *)sender();
|
|
||||||
m_commandResult += p->readAllStandardOutput();
|
|
||||||
// qCritical() << m_commandResult;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Command::readyReadStandardError() {
|
|
||||||
QProcess *p = (QProcess *)sender();
|
|
||||||
QByteArray buf = p->readAllStandardError();
|
|
||||||
qCritical() << buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Command::finished(int /*exitCode*/, QProcess::ExitStatus /*exitStatus*/) {
|
|
||||||
QProcess *p = (QProcess *)sender();
|
|
||||||
// read all remaining data sent to the process, just in case
|
|
||||||
QString d = p->readAllStandardOutput();
|
|
||||||
if (!d.isEmpty()) {
|
|
||||||
m_commandResult += d;
|
|
||||||
}
|
|
||||||
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardOutput()));
|
|
||||||
disconnect(p, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(readyReadStandardError()));
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Command::execute(QString workingDirectory, QStringList args) {
|
|
||||||
|
|
||||||
if (!QDir::setCurrent(workingDirectory)) {
|
|
||||||
qCritical() << "SET WORKING_DIRECTORY" << workingDirectory
|
|
||||||
<< "FAILED FOR" << m_command;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
QScopedPointer<QProcess> p(new QProcess(this));
|
|
||||||
p->setWorkingDirectory(workingDirectory);
|
|
||||||
p->setProcessChannelMode(QProcess::MergedChannels);
|
|
||||||
|
|
||||||
connect(&(*p), SIGNAL(readyReadStandardOutput()), this, SLOT(readyReadStandardOutput()));
|
|
||||||
connect(&(*p), SIGNAL(readyReadStandardError()), this, SLOT(readyReadStandardError()));
|
|
||||||
|
|
||||||
if (!args.isEmpty()) {
|
|
||||||
qDebug() << "START COMMAND" << m_command << "WITH ARGS" << args
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
p->start(m_command, args);
|
|
||||||
} else {
|
|
||||||
qDebug() << "START COMMAND" << m_command
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
p->start(m_command);
|
|
||||||
}
|
|
||||||
|
|
||||||
qint64 const start = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
|
|
||||||
if (p->waitForStarted(m_waitForStartTimeout)) {
|
|
||||||
qDebug() << "PROCESS" << m_command << "STARTED IN" << p->workingDirectory();
|
|
||||||
if (p->state() == QProcess::ProcessState::Running) {
|
|
||||||
qDebug() << "PROCESS" << m_command << "RUNNING IN" << p->workingDirectory();
|
|
||||||
// wait forever for git/opkg-commands to finish
|
|
||||||
int wait = m_waitForFinishTimeout;
|
|
||||||
if (m_command.trimmed().startsWith("git", Qt::CaseInsensitive) ||
|
|
||||||
m_command.trimmed().startsWith("opkg", Qt::CaseInsensitive)) {
|
|
||||||
wait = -1;
|
|
||||||
}
|
|
||||||
bool const no_timeout = p->waitForFinished(wait);
|
|
||||||
if (no_timeout) {
|
|
||||||
qDebug() << "PROCESS" << m_command << "FINISHED IN" << p->workingDirectory();
|
|
||||||
if (p->exitStatus() == QProcess::NormalExit) {
|
|
||||||
if ((m_exitCode = p->exitCode()) == 0) {
|
|
||||||
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
qDebug() << "EXECUTED" << m_command
|
|
||||||
<< QString("(runtime %1ms)").arg(end-start)
|
|
||||||
<< "with code" << m_exitCode
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
return true;
|
|
||||||
} else {
|
|
||||||
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
qCritical() << "EXECUTED" << m_command
|
|
||||||
<< QString("(runtime %1ms)").arg(end-start)
|
|
||||||
<< "with code" << m_exitCode
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
qCritical() << "PROCESS" << m_command << "CRASHED with code"
|
|
||||||
<< p->exitCode()
|
|
||||||
<< QString("(after %1ms)").arg(end-start)
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
qCritical() << "PROCESS" << m_command
|
|
||||||
<< "DID NOT FINISH WITH" << wait
|
|
||||||
<< "MS IN" << p->workingDirectory()
|
|
||||||
<< QString("(runtime %1ms)").arg(end-start);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical() << "WRONG PROCESS STATE" << p->state()
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qint64 const end = QDateTime::currentDateTime().toMSecsSinceEpoch();
|
|
||||||
qCritical() << "PROCESS" << m_command << "TIMEOUT AT START"
|
|
||||||
<< QString("(runtime %1ms)").arg(end-start)
|
|
||||||
<< "IN" << p->workingDirectory();
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
0
UpdatePTUDevCtrl/interfaces.h → plugins/interfaces.h
Normal file → Executable file
0
UpdatePTUDevCtrl/interfaces.h → plugins/interfaces.h
Normal file → Executable file
@@ -98,6 +98,7 @@ bool Update::unloadDCPlugin() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class hwapi;
|
||||||
Update::Update(Worker *worker,
|
Update::Update(Worker *worker,
|
||||||
QString customerRepository,
|
QString customerRepository,
|
||||||
QString customerNrStr,
|
QString customerNrStr,
|
||||||
@@ -122,31 +123,70 @@ Update::Update(Worker *worker,
|
|||||||
, m_dryRun(dryRun)
|
, m_dryRun(dryRun)
|
||||||
, m_sys_areDCdataValid(false) {
|
, m_sys_areDCdataValid(false) {
|
||||||
|
|
||||||
int tries = 20;
|
if (!m_hw) {
|
||||||
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_hw == nullptr -> ca-slave plugin loaded ???";
|
||||||
// must deliver 'true', only then are all data from hwapi valid
|
} else {
|
||||||
if (--tries < 0) {
|
int tries = 20;
|
||||||
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
while ((m_sys_areDCdataValid = m_hw->sys_areDCdataValid()) == false) {
|
||||||
break;
|
// must deliver 'true', only then are all data from hwapi valid
|
||||||
|
if (--tries < 0) {
|
||||||
|
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
m_hw->dc_autoRequest(true);
|
||||||
|
QThread::msleep(500);
|
||||||
}
|
}
|
||||||
m_hw->dc_autoRequest(true);
|
|
||||||
QThread::msleep(500);
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") m_sys_areDCDataValid ..."
|
||||||
|
<< m_sys_areDCdataValid;
|
||||||
|
|
||||||
|
QObject const *obj = m_hw->getAPI();
|
||||||
|
Q_ASSERT(obj != nullptr);
|
||||||
|
|
||||||
|
QDebug critical = qCritical();
|
||||||
|
critical << "connect() to onReportDCDownloadStatus() ...";
|
||||||
|
if (!connect(obj,
|
||||||
|
SIGNAL(hwapi_reportDCDownloadStatus(QString const&)),
|
||||||
|
this,
|
||||||
|
SLOT(onReportDCDownloadStatus(QString const &)))) {
|
||||||
|
critical << "FAILED";
|
||||||
|
} else critical << "DONE";
|
||||||
|
|
||||||
|
critical = qCritical();
|
||||||
|
critical << "connect() to onReportDCDownloadSuccess() ...";
|
||||||
|
if (!connect(obj,
|
||||||
|
SIGNAL(hwapi_reportDCDownloadSuccess(QString const&)), this,
|
||||||
|
SLOT(onReportDCDownloadSuccess(QString const &)))) {
|
||||||
|
critical << "FAILED";
|
||||||
|
} else critical << "DONE";
|
||||||
|
|
||||||
|
critical = qCritical();
|
||||||
|
critical << "connect() to onReportDCDownloadFailure() ...";
|
||||||
|
if (!connect(obj,
|
||||||
|
SIGNAL(hwapi_reportDCDownloadFailure(QString const &)), this,
|
||||||
|
SLOT(onReportDCDownloadFailure(QString const &)))) {
|
||||||
|
critical << "FAILED";
|
||||||
|
} else critical << "DONE";
|
||||||
}
|
}
|
||||||
|
|
||||||
qCritical() << __PRETTY_FUNCTION__ << "m_sys_areDCDataValid ..." << m_sys_areDCdataValid;
|
|
||||||
|
|
||||||
//qInfo() << "UPDATE: m_serialInterface ..." << m_serialInterface;
|
|
||||||
//qInfo() << "UPDATE: m_baudrate ..." << m_baudrate;
|
|
||||||
//qInfo() << "UPDATE: m_customerRepository ..." << m_customerRepository;
|
|
||||||
//qInfo() << "UPDATE: m_customerNr ..........." << m_customerNrStr;
|
|
||||||
//qInfo() << "UPDATE: m_branchName ..........." << m_branchName;
|
|
||||||
//qInfo() << "UPDATE: m_pluginName ..........." << m_pluginName;
|
|
||||||
//qInfo() << "UPDATE: m_workingDirectory ....." << m_workingDir;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Update::~Update() {
|
Update::~Update() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Update::onReportDCDownloadStatus(QString const &status) {
|
||||||
|
emit m_worker->showStatusMessage("DL", status);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::onReportDCDownloadSuccess(QString const &msg) {
|
||||||
|
qCritical() << "msg" << msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update::onReportDCDownloadFailure(QString const &errorMsg) {
|
||||||
|
qCritical() << "msg" << errorMsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// br is a index into a table, used for historical reasons.
|
// br is a index into a table, used for historical reasons.
|
||||||
bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
bool Update::openSerial(int br, QString baudrate, QString comPort) const {
|
||||||
qDebug() << "opening serial" << br << baudrate << comPort << "...";
|
qDebug() << "opening serial" << br << baudrate << comPort << "...";
|
||||||
@@ -590,7 +630,6 @@ bool Update::checkDownloadedJsonVersions(QStringList const& jsonFileNames) {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
||||||
if (m_sys_areDCdataValid == false) {
|
if (m_sys_areDCdataValid == false) {
|
||||||
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
qCritical() << "ERROR!!! DC DATA NOT VALID -> CA-MASTER-PLUGIN NOT CONNECTED";
|
||||||
@@ -598,30 +637,76 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool res = false;
|
bool res = false;
|
||||||
|
bool dcDownloadPossible = true;
|
||||||
|
|
||||||
QList<QString>::const_iterator it;
|
QList<QString>::const_iterator it;
|
||||||
for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
|
for (it = filesToWorkOn.cbegin(); it != filesToWorkOn.cend(); ++it) {
|
||||||
m_worker->startProgressLoop();
|
m_worker->startProgressLoop();
|
||||||
|
|
||||||
QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
|
QString const &fToWorkOn = QDir::cleanPath(m_customerRepository + QDir::separator() + it->trimmed());
|
||||||
|
if (fToWorkOn.endsWith("/dc2c.bin") && dcDownloadPossible) {
|
||||||
|
// download for dc possible only once
|
||||||
|
// download of device-controller should always be the last step
|
||||||
|
dcDownloadPossible = false;
|
||||||
|
|
||||||
|
if (!m_hw->dcDownloadRequest(fToWorkOn)) { // initiate download process
|
||||||
|
qCritical() << "DOWNLOAD-REQUEST-ERROR FOR" << fToWorkOn;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
QThread::sleep(2);
|
||||||
|
|
||||||
|
if (!m_hw->dcDownloadRunning()) { // may take some time
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD NOT RUNNING";
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD RUNNING";
|
||||||
|
|
||||||
|
QThread::sleep(2);
|
||||||
|
|
||||||
|
if (!m_hw->dcDownloadReportThreadStart()) { // may take some time
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD NOT STARTED";
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") REPORT THREAD STARTED";
|
||||||
|
|
||||||
|
QThread::sleep(2);
|
||||||
|
if (!m_hw->dcDownloadReportRunning()) { // may take some time
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT NOT RUNNING";
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
qCritical() << QDateTime::currentDateTime().toString(Qt::ISODate)
|
||||||
|
<< "(" << __func__ << ":" << __LINE__ << ") DOWNLOAD REPORT RUNNING";
|
||||||
|
|
||||||
|
|
||||||
|
while (m_hw->dcDownloadReportRunning()) {
|
||||||
|
QThread::msleep(500);
|
||||||
|
}
|
||||||
|
|
||||||
if (fToWorkOn.contains("dc2c.bin")) {
|
|
||||||
bool updateBinaryRes = true;
|
bool updateBinaryRes = true;
|
||||||
|
|
||||||
// CONSOLE()
|
// CONSOLE()
|
||||||
|
#if 0
|
||||||
|
m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
||||||
|
QThread::sleep(1); // wait to be sure that there are no more
|
||||||
|
// commands sent to dc-hardware
|
||||||
|
|
||||||
// m_hw->dc_autoRequest(false);// default: turn auto-request setting off
|
if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
|
||||||
// QThread::sleep(1); // wait to be sure that there are no more
|
|
||||||
// // commands sent to dc-hardware
|
|
||||||
|
|
||||||
// if ((updateBinaryRes = updateBinary(fToWorkOn)) == true) {
|
|
||||||
//
|
|
||||||
// qCritical() << "downloaded binary" << fToWorkOn;
|
// qCritical() << "downloaded binary" << fToWorkOn;
|
||||||
|
|
||||||
// ++displayIndex;
|
++displayIndex;
|
||||||
// emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(2, ' ') + QString(")")
|
||||||
// + QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
// Worker::UPDATE_STEP_DONE);
|
Worker::UPDATE_STEP_DONE);
|
||||||
//}
|
}
|
||||||
|
|
||||||
m_hw->dc_autoRequest(true); // turn auto-request setting on
|
m_hw->dc_autoRequest(true); // turn auto-request setting on
|
||||||
|
|
||||||
@@ -637,65 +722,65 @@ bool Update::doUpdate(int &displayIndex, QStringList const &filesToWorkOn) {
|
|||||||
qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
|
qInfo() << "dc-firmware-version (NOT UPDATED)" << versions[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
res = updateBinaryRes;
|
res = updateBinaryRes;
|
||||||
|
|
||||||
} else {
|
} else if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
|
||||||
if (fToWorkOn.contains("DC2C_print", Qt::CaseInsensitive)
|
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
res = true;
|
res = true;
|
||||||
int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
|
int i = fToWorkOn.indexOf("DC2C_print", Qt::CaseInsensitive);
|
||||||
int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
|
int const templateIdx = fToWorkOn.mid(i).midRef(10, 2).toInt();
|
||||||
if ((templateIdx < 1) || (templateIdx > 32)) {
|
if ((templateIdx < 1) || (templateIdx > 32)) {
|
||||||
qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
|
qCritical() << "WRONG TEMPLATE INDEX" << templateIdx;
|
||||||
res = false;
|
|
||||||
} else {
|
|
||||||
if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
|
|
||||||
Utils::printInfoMsg(
|
|
||||||
QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
|
|
||||||
.arg(fToWorkOn)
|
|
||||||
.arg(templateIdx));
|
|
||||||
++displayIndex;
|
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
|
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
|
||||||
res = true;
|
|
||||||
if ((res = updateCashConf(fToWorkOn))) {
|
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
|
|
||||||
++displayIndex;
|
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
|
||||||
}
|
|
||||||
} else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
|
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
|
||||||
res = true;
|
|
||||||
if ((res= updateConfig(fToWorkOn))) {
|
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
|
|
||||||
++displayIndex;
|
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
|
||||||
}
|
|
||||||
} else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
|
|
||||||
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
|
||||||
res = true;
|
|
||||||
if ((res = updateDeviceConf(fToWorkOn))) {
|
|
||||||
Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
|
|
||||||
++displayIndex;
|
|
||||||
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
|
||||||
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
|
||||||
Worker::UPDATE_STEP_DONE);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
|
|
||||||
res = false;
|
res = false;
|
||||||
|
} else {
|
||||||
|
if ((res = updatePrinterTemplate(templateIdx, fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(
|
||||||
|
QString("DOWNLOADED PRINTER TEMPLATE %1 WITH INDEX=%2")
|
||||||
|
.arg(fToWorkOn)
|
||||||
|
.arg(templateIdx));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_cash", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res = updateCashConf(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED CASH TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_conf", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res= updateConfig(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED CONFIG TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else if (fToWorkOn.contains("DC2C_device", Qt::CaseInsensitive)
|
||||||
|
&& fToWorkOn.endsWith(".json", Qt::CaseInsensitive)) {
|
||||||
|
res = true;
|
||||||
|
if ((res = updateDeviceConf(fToWorkOn))) {
|
||||||
|
Utils::printInfoMsg(QString("DOWNLOADED DEVICE TEMPLATE %1").arg(fToWorkOn));
|
||||||
|
++displayIndex;
|
||||||
|
emit m_worker->appendText(QString("\n(") + QString("%1").arg(displayIndex).rightJustified(3, ' ') + QString(")")
|
||||||
|
+ QString(" Update ") + QFileInfo(fToWorkOn).fileName(),
|
||||||
|
Worker::UPDATE_STEP_DONE);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
qCritical() << "UNKNOWN JSON FILE NAME" << fToWorkOn;
|
||||||
|
res = false;
|
||||||
}
|
}
|
||||||
|
// m_worker->stopProgressLoop();
|
||||||
|
// m_worker->setProgress(100);
|
||||||
|
|
||||||
if (res == false) {
|
if (res == false) {
|
||||||
break;
|
break;
|
||||||
@@ -94,6 +94,8 @@ private slots:
|
|||||||
void readyReadStandardOutput();
|
void readyReadStandardOutput();
|
||||||
void readyReadStandardError();
|
void readyReadStandardError();
|
||||||
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
void finished(int exitCode, QProcess::ExitStatus exitStatus);
|
||||||
|
void onReportDCDownloadStatus(QString const &status);
|
||||||
|
void onReportDCDownloadSuccess(QString const &msg);
|
||||||
|
void onReportDCDownloadFailure(QString const &errorMsg);
|
||||||
};
|
};
|
||||||
#endif // UPDATE_H_INCLUDED
|
#endif // UPDATE_H_INCLUDED
|
||||||
@@ -165,8 +165,14 @@ Worker::Worker(int customerNr,
|
|||||||
|
|
||||||
// TODO: turn object into singleton
|
// TODO: turn object into singleton
|
||||||
instance = this;
|
instance = this;
|
||||||
|
|
||||||
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||||
|
m_update = new Update(this,
|
||||||
|
QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
|
||||||
|
m_customerNrStr,
|
||||||
|
m_branchName,
|
||||||
|
m_pluginDir,
|
||||||
|
m_pluginName,
|
||||||
|
m_workingDirectory);
|
||||||
|
|
||||||
this->setObjectName("worker-object");
|
this->setObjectName("worker-object");
|
||||||
QDir::setCurrent(m_workingDirectory);
|
QDir::setCurrent(m_workingDirectory);
|
||||||
@@ -175,6 +181,10 @@ Worker::Worker(int customerNr,
|
|||||||
}
|
}
|
||||||
|
|
||||||
Worker::~Worker() {
|
Worker::~Worker() {
|
||||||
|
if (m_update != nullptr) {
|
||||||
|
delete m_update;
|
||||||
|
m_update = nullptr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Worker::displayProgressInMainWindow(int progress) {
|
void Worker::displayProgressInMainWindow(int progress) {
|
||||||
@@ -429,18 +439,6 @@ void Worker::privateUpdate() {
|
|||||||
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::CHECKOUT_BRANCH);
|
||||||
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
setProgress(_CHECKOUT_BRANCH_SUCCESS);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
|
||||||
//
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
|
||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
|
||||||
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY
|
// COMPUTE CHANGED FILES OF CUSTOMER REPOSITORY
|
||||||
@@ -480,6 +478,19 @@ void Worker::privateUpdate() {
|
|||||||
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::DOWNLOAD_FILES_TO_PSA_HARDWARE));
|
||||||
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
setProgress(_DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS);
|
||||||
|
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// (R)SYNC THE REPOSITORY WITH THE LOCAL FILEYSTEM
|
||||||
|
//
|
||||||
|
////////////////////////////////////////////////////////////////////////////
|
||||||
|
if ((continueUpdate = syncCustomerRepositoryAndFS()) == false) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lst = QStringList(QString(smap[UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS]));
|
||||||
|
ISMAS(lst) << (GUI(lst) << (CONSOLE(lst) << UPDATE_STEP::SYNC_CUSTOMER_REPOSITORY_SUCCESS));
|
||||||
|
setProgress(_SYNC_CUSTOMER_REPOSITORY_SUCCESS);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// FUTURE: SAVE LOG FILES
|
// FUTURE: SAVE LOG FILES
|
||||||
@@ -751,7 +762,7 @@ bool Worker::filesToUpdate() {
|
|||||||
}
|
}
|
||||||
m_filesToUpdate.removeDuplicates();
|
m_filesToUpdate.removeDuplicates();
|
||||||
|
|
||||||
qCritical() << __PRETTY_FUNCTION__ << "FILES-TO-UPDATE" << m_filesToUpdate;
|
qCritical() << "(" << __func__ << ":" << __LINE__ << ") FILES-TO-UPDATE" << m_filesToUpdate;
|
||||||
|
|
||||||
GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
|
GUI(m_filesToUpdate) << (CONSOLE(m_filesToUpdate) << UPDATE_STEP::FILES_TO_UPDATE);
|
||||||
setProgress(_FILES_TO_UPDATE);
|
setProgress(_FILES_TO_UPDATE);
|
||||||
@@ -888,15 +899,7 @@ bool Worker::downloadFilesToPSAHardware() {
|
|||||||
QStringList lst = m_filesToDownload;
|
QStringList lst = m_filesToDownload;
|
||||||
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
|
ISMAS(lst) << (CONSOLE(lst) << UPDATE_STEP::FILES_TO_DOWNLOAD);
|
||||||
|
|
||||||
Update update(this,
|
if (m_update && m_update->doUpdate(m_displayIndex, m_filesToDownload)) {
|
||||||
QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
|
|
||||||
m_customerNrStr,
|
|
||||||
m_branchName,
|
|
||||||
m_pluginDir,
|
|
||||||
m_pluginName,
|
|
||||||
m_workingDirectory);
|
|
||||||
|
|
||||||
if (update.doUpdate(m_displayIndex, m_filesToDownload)) {
|
|
||||||
// prepared for use: at the moment, the dc-library does not work
|
// prepared for use: at the moment, the dc-library does not work
|
||||||
// as expected.
|
// as expected.
|
||||||
|
|
||||||
@@ -1060,6 +1063,17 @@ QString Worker::getAPISMYoctoInstallationStatus() {
|
|||||||
return "N/A";
|
return "N/A";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString Worker::getDCVersionPreparedForDownload(QString const &filename) {
|
||||||
|
if (QFile::exists(filename)) { // <customer-repo/etc/dc/dc2c.bin>
|
||||||
|
QString const cmd = QString("strings %1 | grep -e DC2[Cc]\\. | head -n1").arg(filename);
|
||||||
|
Command c("bash");
|
||||||
|
if (c.execute("/tmp", QStringList() << "-c" << cmd)) {
|
||||||
|
return c.getCommandResult(); // DC2c.04.42 14.09.2023
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "N/A";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
QString Worker::getATBQTVersion() const {
|
QString Worker::getATBQTVersion() const {
|
||||||
QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
|
QString const cmd = QString("echo -n $(/opt/app/ATBAPP/ATBQT -v | head -n 2 | cut -d':' -f2)");
|
||||||
@@ -1184,7 +1198,9 @@ PSAInstalled Worker::getPSAInstalled() {
|
|||||||
if (m_versionInfo.size() == 3) {
|
if (m_versionInfo.size() == 3) {
|
||||||
qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
|
qCritical() << QString("***** %1:%2").arg(__func__).arg(__LINE__)
|
||||||
<< "m_versionInfo" << m_versionInfo << "*****";
|
<< "m_versionInfo" << m_versionInfo << "*****";
|
||||||
psaInstalled.versionInfo.lastCommit = m_versionInfo.at(0);
|
psaInstalled.versionInfo.lastCommit = QString("%1-%2")
|
||||||
|
.arg(QCoreApplication::applicationPid())
|
||||||
|
.arg(m_versionInfo.at(0));
|
||||||
psaInstalled.versionInfo.reason = m_versionInfo.at(1);
|
psaInstalled.versionInfo.reason = m_versionInfo.at(1);
|
||||||
psaInstalled.versionInfo.created = m_versionInfo.at(2);
|
psaInstalled.versionInfo.created = m_versionInfo.at(2);
|
||||||
}
|
}
|
||||||
@@ -61,12 +61,9 @@
|
|||||||
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
#define _UPDATE_REPOSITORY_SUCCESS (27)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
#define _CHECK_FOR_REPOSITORY_CHANGES (28)
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
#define _CHECK_FOR_REPOSITORY_CHANGES_SUCCESS (29)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY (30)
|
#define _FILES_TO_UPDATE (30)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (31)
|
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (31)
|
||||||
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (32)
|
#define _FILES_TO_DOWNLOAD (32)
|
||||||
#define _FILES_TO_UPDATE (33)
|
|
||||||
#define _CHECK_FOR_REPOSITORY_CHANGES_FAILURE (34)
|
|
||||||
#define _FILES_TO_DOWNLOAD (35)
|
|
||||||
#define _EXEC_OPKG_COMMANDS (41)
|
#define _EXEC_OPKG_COMMANDS (41)
|
||||||
#define _EXEC_OPKG_COMMAND_1 (42)
|
#define _EXEC_OPKG_COMMAND_1 (42)
|
||||||
#define _EXEC_OPKG_COMMAND_2 (43)
|
#define _EXEC_OPKG_COMMAND_2 (43)
|
||||||
@@ -89,6 +86,9 @@
|
|||||||
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
#define _DOWNLOAD_DEVICE_CONTROLLER_FAILURE (86)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_FAILURE (87)
|
||||||
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
#define _DOWNLOAD_FILES_TO_PSA_HARDWARE_SUCCESS (88)
|
||||||
|
#define _SYNC_CUSTOMER_REPOSITORY (89)
|
||||||
|
#define _SYNC_CUSTOMER_REPOSITORY_FAILURE (90)
|
||||||
|
#define _SYNC_CUSTOMER_REPOSITORY_SUCCESS (91)
|
||||||
#define _SAVE_LOGS (92)
|
#define _SAVE_LOGS (92)
|
||||||
#define _SAVE_LOGS_FAILURE (93)
|
#define _SAVE_LOGS_FAILURE (93)
|
||||||
#define _SAVE_LOGS_SUCCESS (94)
|
#define _SAVE_LOGS_SUCCESS (94)
|
||||||
@@ -249,7 +249,6 @@ class Worker : public QThread{
|
|||||||
<< UPDATE_STEP::SEND_LAST_VERSION));
|
<< UPDATE_STEP::SEND_LAST_VERSION));
|
||||||
}
|
}
|
||||||
m_worker->stopProgressLoop();
|
m_worker->stopProgressLoop();
|
||||||
|
|
||||||
m_worker->m_updateProcessRunning = false;
|
m_worker->m_updateProcessRunning = false;
|
||||||
emit m_worker->enableExit();
|
emit m_worker->enableExit();
|
||||||
emit m_worker->restartExitTimer();
|
emit m_worker->restartExitTimer();
|
||||||
@@ -370,6 +369,7 @@ public:
|
|||||||
static QString getATBUpdateToolYoctoInstallationStatus();
|
static QString getATBUpdateToolYoctoInstallationStatus();
|
||||||
static QString getAPISMYoctoVersion();
|
static QString getAPISMYoctoVersion();
|
||||||
static QString getAPISMYoctoInstallationStatus();
|
static QString getAPISMYoctoInstallationStatus();
|
||||||
|
static QString getDCVersionPreparedForDownload(QString const &filename);
|
||||||
|
|
||||||
static const QString UPDATE_STEP_OK;
|
static const QString UPDATE_STEP_OK;
|
||||||
static const QString UPDATE_STEP_DONE;
|
static const QString UPDATE_STEP_DONE;
|
||||||
Reference in New Issue
Block a user