From 3bac92c711761c265dcbee6fc9ac248fa3ae6934 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 25 May 2023 10:21:42 +0200 Subject: [PATCH] Add subtree add command to make sure DCPlugin is included --- OnDemandUpdatePTU.pro | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 OnDemandUpdatePTU.pro diff --git a/OnDemandUpdatePTU.pro b/OnDemandUpdatePTU.pro new file mode 100644 index 0000000..899dbfc --- /dev/null +++ b/OnDemandUpdatePTU.pro @@ -0,0 +1,73 @@ +# QT -= gui +QT += core +QT += widgets serialport +QT += network + +TARGET = up_dev_ctrl + +CONFIG += c++11 +# CONFIG -= app_bundle + +# DEFINES+=LinuxDesktop + +QMAKE_CXXFLAGS += -Wno-deprecated-copy + +# custom target for 'git subtree' +# subtree.target = subtree +# subtree.commands = git subtree add --prefix DCPlugin https://git.mimbach49.de/GerhardHoffmann/DCPlugin.git master --squash +# 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 { + # $$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. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +contains( CONFIG, PTU5 ) { + greaterThan(QT_MAJOR_VERSION, 4): QT += serialport + CONFIG += link_pkgconfig + lessThan(QT_MAJOR_VERSION, 5): PKGCONFIG += qextserialport + QMAKE_CXXFLAGS += -std=c++11 # for GCC >= 4.7 + QMAKE_CXXFLAGS += -Wno-deprecated-copy + ARCH = PTU5 + DEFINES+=PTU5 +} +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++11 + QMAKE_CXXFLAGS += -Wno-deprecated-copy + linux-clang { QMAKE_CXXFLAGS += -Qunused-arguments } + ARCH = DesktopLinux + DEFINES+=DesktopLinux +} + +SOURCES += \ + main.cpp \ + update.cpp \ + message_handler.cpp + +HEADERS += \ + update.h \ + message_handler.h \ + DCPlugin/include/interfaces.h + +OTHER_FILES += \ + /opt/app/tools/atbupdate/update_log.csv + +# 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) + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target