Compare commits
2 Commits
336d208906
...
cd30cc91f0
Author | SHA1 | Date | |
---|---|---|---|
cd30cc91f0 | |||
6683b925aa |
@ -133,7 +133,9 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# In case there is an automatic update (00:00-04:00) use M0100 instead
|
# In case there is an automatic update (00:00-04:00) use M0100 instead
|
||||||
# of U0002.
|
# of U0002.
|
||||||
# 1.4.10 : Fix: for the time being, never set the autoRequest-flag to false.
|
# 1.4.10 : Fix: for the time being, never set the autoRequest-flag to false.
|
||||||
VERSION="1.4.10"
|
# 1.4.11 : Fix: remove hard-coded path to git-repos of gitea in mimbach. Read
|
||||||
|
# from ATBUpdateTool.ini the url for the gitrepositories.
|
||||||
|
VERSION="1.4.11"
|
||||||
# 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
|
||||||
|
@ -9,14 +9,15 @@
|
|||||||
#include <QStringList>
|
#include <QStringList>
|
||||||
|
|
||||||
|
|
||||||
GitClient::GitClient(QString const &customerNrStr,
|
GitClient::GitClient(QString const &customerRepositoryPath,
|
||||||
|
QString const &customerNrStr,
|
||||||
QString const &customerRepository,
|
QString const &customerRepository,
|
||||||
QString const &workingDirectory,
|
QString const &workingDirectory,
|
||||||
QString const &branchName,
|
QString const &branchName,
|
||||||
QObject *parent)
|
QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
, m_worker(qobject_cast<Worker *>(parent))
|
, m_worker(qobject_cast<Worker *>(parent))
|
||||||
, m_repositoryPath(QString("https://git.mimbach49.de/GerhardHoffmann/%1.git").arg(customerNrStr))
|
, m_repositoryPath(customerRepositoryPath)
|
||||||
, m_customerNr(customerNrStr)
|
, m_customerNr(customerNrStr)
|
||||||
, m_workingDirectory(workingDirectory)
|
, m_workingDirectory(workingDirectory)
|
||||||
, m_branchName(branchName)
|
, m_branchName(branchName)
|
||||||
|
@ -22,7 +22,8 @@ class GitClient : public QObject {
|
|||||||
bool copyGitConfigFromMaster();
|
bool copyGitConfigFromMaster();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit GitClient(QString const &customerNrStr,
|
explicit GitClient(QString const &customerRepositoryUrl,
|
||||||
|
QString const &customerNrStr,
|
||||||
QString const &repositoryPath,
|
QString const &repositoryPath,
|
||||||
QString const &workingDirectory = QCoreApplication::applicationDirPath(),
|
QString const &workingDirectory = QCoreApplication::applicationDirPath(),
|
||||||
QString const &branchName = "master",
|
QString const &branchName = "master",
|
||||||
|
@ -157,7 +157,7 @@ Worker::Worker(int customerNr,
|
|||||||
, m_parent(parent)
|
, m_parent(parent)
|
||||||
, m_serialInterface(serialInterface)
|
, m_serialInterface(serialInterface)
|
||||||
, m_baudrate(baudrate)
|
, m_baudrate(baudrate)
|
||||||
, m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
|
, m_gc(m_customerRepositoryPath, m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this)
|
||||||
, m_versionInfo(QStringList())
|
, m_versionInfo(QStringList())
|
||||||
, m_osVersion(getOsVersion())
|
, m_osVersion(getOsVersion())
|
||||||
, m_atbqtVersion(getATBQTVersion())
|
, m_atbqtVersion(getATBQTVersion())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user