GerhardHoffmann/UpdatePTUDevCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use DCPlugin subtree anymore

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-06-16 16:47:56 +02:00
parent e2d9c5aa90
commit c4c503080e
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
OnDemandUpdatePTU.pro
View File

@ -3,9 +3,11 @@ QT += core
QT += widgets serialport
QT += network
TARGET = up_dev_ctrl
TARGET = ATBUpdateDC
CONFIG += c++11
INCLUDEPATH += plugins
CONFIG += c++17
# CONFIG -= app_bundle
# DEFINES+=LinuxDesktop
@ -18,11 +20,11 @@ QMAKE_CXXFLAGS += -Wno-deprecated-copy
# subtree.depends =
# QMAKE_EXTRA_UNIX_TARGETS += subtree
! exists(DCPlugin) {
$$system("git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash")
} else {
# ! exists(DCPlugin) {
# $$system("git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash")
# } else {
# $$system("git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash")
}
# }
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
@ -52,20 +54,27 @@ contains( CONFIG, DesktopLinux ) {
SOURCES += \
main.cpp \
update.cpp \
message_handler.cpp
message_handler.cpp \
worker.cpp \
worker_thread.cpp
HEADERS += \
update.h \
message_handler.h \
DCPlugin/include/interfaces.h
worker.h \
worker_thread.h \
plugins/interfaces.h
OTHER_FILES += \
/opt/app/tools/atbupdate/update_log.csv
/opt/app/tools/atbupdate/update_log.csv \
main.cpp.bck \
main.cpp.bck2 \
main.cpp.bck3
# https://blog.developer.atlassian.com/the-power-of-git-subtree/?_ga=2-71978451-1385799339-1568044055-1068396449-1567112770
# git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash
# git subtree pull --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash
include(./DCPlugin/DCPlugin.pri)
# include(./DCPlugin/DCPlugin.pri)
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin