From 4f339fb3bfb355469677ce0b669fdbecb5165386 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Wed, 11 Dec 2024 16:21:16 +0100 Subject: [PATCH 1/3] Remove qmake project files. Signed-off-by: Alexander Wenzel --- BuildDltParser.pro | 7 - BuildDltViewer.pro | 13 -- commander/commander.pro | 37 --- plugin/dltdbusplugin/dltdbusplugin.pro | 21 -- .../dltlogstorageplugin.pro | 27 --- .../dltsegmentationplugin.pro | 25 -- .../dltsystemviewerplugin.pro | 25 -- .../dlttestrobotplugin/dlttestrobotplugin.pro | 25 -- plugin/dltviewerplugin/dltviewerplugin.pro | 25 -- .../dummycommandplugin/dummycommandplugin.pro | 23 -- .../dummycontrolplugin/dummycontrolplugin.pro | 25 -- .../dummydecoderplugin/dummydecoderplugin.pro | 22 -- .../dummyviewerplugin/dummyviewerplugin.pro | 25 -- .../filetransferplugin/filetransferplugin.pro | 41 ---- plugin/nonverboseplugin/nonverboseplugin.pro | 26 --- plugin/plugin.pro | 5 - qdlt/qdlt.pro | 115 --------- sdk/BuildPlugins.pro | 5 - sdk/dummycontrolplugin.pro | 38 --- sdk/dummydecoderplugin.pro | 34 --- sdk/dummyviewerplugin.pro | 38 --- src/src.pro | 221 ------------------ 22 files changed, 823 deletions(-) delete mode 100644 BuildDltParser.pro delete mode 100644 BuildDltViewer.pro delete mode 100644 commander/commander.pro delete mode 100644 plugin/dltdbusplugin/dltdbusplugin.pro delete mode 100644 plugin/dltlogstorageplugin/dltlogstorageplugin.pro delete mode 100644 plugin/dltsegmentationplugin/dltsegmentationplugin.pro delete mode 100644 plugin/dltsystemviewerplugin/dltsystemviewerplugin.pro delete mode 100644 plugin/dlttestrobotplugin/dlttestrobotplugin.pro delete mode 100644 plugin/dltviewerplugin/dltviewerplugin.pro delete mode 100644 plugin/dummycommandplugin/dummycommandplugin.pro delete mode 100644 plugin/dummycontrolplugin/dummycontrolplugin.pro delete mode 100644 plugin/dummydecoderplugin/dummydecoderplugin.pro delete mode 100644 plugin/dummyviewerplugin/dummyviewerplugin.pro delete mode 100644 plugin/filetransferplugin/filetransferplugin.pro delete mode 100644 plugin/nonverboseplugin/nonverboseplugin.pro delete mode 100644 plugin/plugin.pro delete mode 100644 qdlt/qdlt.pro delete mode 100644 sdk/BuildPlugins.pro delete mode 100644 sdk/dummycontrolplugin.pro delete mode 100644 sdk/dummydecoderplugin.pro delete mode 100644 sdk/dummyviewerplugin.pro delete mode 100644 src/src.pro diff --git a/BuildDltParser.pro b/BuildDltParser.pro deleted file mode 100644 index 4c2ebb96..00000000 --- a/BuildDltParser.pro +++ /dev/null @@ -1,7 +0,0 @@ -# -CXXFLAGS +=-Wunused - -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS += parser -CONFIG += c++11 diff --git a/BuildDltViewer.pro b/BuildDltViewer.pro deleted file mode 100644 index fb038814..00000000 --- a/BuildDltViewer.pro +++ /dev/null @@ -1,13 +0,0 @@ -# -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS += qdlt src plugin commander -CONFIG += c++1z - -ICON = Project.icns -QMAKE_INFO_PLIST = Info.plist - -# Qt doesn't copy over the .icns file ?! -RESOURCE_FILES.files = $$ICON -RESOURCE_FILES.path = Contents/Resources -QMAKE_BUNDLE_DATA += RESOURCE_FILES diff --git a/commander/commander.pro b/commander/commander.pro deleted file mode 100644 index f50d84b3..00000000 --- a/commander/commander.pro +++ /dev/null @@ -1,37 +0,0 @@ -QT = core - -CONFIG += c++17 cmdline - -# 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 - -# Executable name -TARGET = dlt-commander - -# Local includes -INCLUDEPATH = . ../qdlt - -# Unix executable install path -target.path = $$PREFIX/usr/bin -INSTALLS += target - -# Library definitions for debug and release builds -CONFIG(debug, debug|release) { - DESTDIR = ../debug - QMAKE_LIBDIR += ../debug - LIBS += -lqdltd -} else { - DESTDIR = ../release - QMAKE_LIBDIR += ../release - QMAKE_RPATHDIR += ../build/release - LIBS += -lqdlt -} - -SOURCES += \ - main.cpp \ - optmanager.cpp - -HEADERS += \ - export_rules.h \ - optmanager.h diff --git a/plugin/dltdbusplugin/dltdbusplugin.pro b/plugin/dltdbusplugin/dltdbusplugin.pro deleted file mode 100644 index 9a31440f..00000000 --- a/plugin/dltdbusplugin/dltdbusplugin.pro +++ /dev/null @@ -1,21 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# target name -TARGET = $$qtLibraryTarget(dltdbusplugin) - -# plugin header files -HEADERS += \ - dltdbusplugin.h \ - form.h \ - dbus.h - -# plugin source files -SOURCES += \ - dltdbusplugin.cpp \ - form.cpp \ - dbus.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dltlogstorageplugin/dltlogstorageplugin.pro b/plugin/dltlogstorageplugin/dltlogstorageplugin.pro deleted file mode 100644 index c41b717b..00000000 --- a/plugin/dltlogstorageplugin/dltlogstorageplugin.pro +++ /dev/null @@ -1,27 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dltlogstorageplugin) - -# plugin header files -HEADERS += \ - dltlogstorageconfigcreatorplugin.h \ - logstorageconfigcreatorform.h \ - logstoragefilter.h - -# plugin source files -SOURCES += \ - dltlogstorageconfigcreatorplugin.cpp \ - logstorageconfigcreatorform.cpp \ - logstoragefilter.cpp - -# plugin forms -FORMS += \ - logstorageconfigcreatorform.ui diff --git a/plugin/dltsegmentationplugin/dltsegmentationplugin.pro b/plugin/dltsegmentationplugin/dltsegmentationplugin.pro deleted file mode 100644 index 687621e3..00000000 --- a/plugin/dltsegmentationplugin/dltsegmentationplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dltsegmentationplugin) - -# plugin header files -HEADERS += \ - dltsegmentationplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dltsegmentationplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dltsystemviewerplugin/dltsystemviewerplugin.pro b/plugin/dltsystemviewerplugin/dltsystemviewerplugin.pro deleted file mode 100644 index f5b7fc5d..00000000 --- a/plugin/dltsystemviewerplugin/dltsystemviewerplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dltsystemviewerplugin) - -# plugin header files -HEADERS += \ - dltsystemviewerplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dltsystemviewerplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dlttestrobotplugin/dlttestrobotplugin.pro b/plugin/dlttestrobotplugin/dlttestrobotplugin.pro deleted file mode 100644 index f39eab69..00000000 --- a/plugin/dlttestrobotplugin/dlttestrobotplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dlttestrobotplugin) - -# plugin header files -HEADERS += \ - dlttestrobotplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dlttestrobotplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dltviewerplugin/dltviewerplugin.pro b/plugin/dltviewerplugin/dltviewerplugin.pro deleted file mode 100644 index 0a8737c9..00000000 --- a/plugin/dltviewerplugin/dltviewerplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dltviewerplugin) - -# plugin header files -HEADERS += \ - dltviewerplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dltviewerplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dummycommandplugin/dummycommandplugin.pro b/plugin/dummycommandplugin/dummycommandplugin.pro deleted file mode 100644 index d172e684..00000000 --- a/plugin/dummycommandplugin/dummycommandplugin.pro +++ /dev/null @@ -1,23 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dummycommandplugin) - -# plugin header files -HEADERS += \ - dummycommandplugin.h - -# plugin source files -SOURCES += \ - dummycommandplugin.cpp - -# plugin forms -FORMS += - diff --git a/plugin/dummycontrolplugin/dummycontrolplugin.pro b/plugin/dummycontrolplugin/dummycontrolplugin.pro deleted file mode 100644 index 5566046f..00000000 --- a/plugin/dummycontrolplugin/dummycontrolplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dummycontrolplugin) - -# plugin header files -HEADERS += \ - dummycontrolplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dummycontrolplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/dummydecoderplugin/dummydecoderplugin.pro b/plugin/dummydecoderplugin/dummydecoderplugin.pro deleted file mode 100644 index 9374a37b..00000000 --- a/plugin/dummydecoderplugin/dummydecoderplugin.pro +++ /dev/null @@ -1,22 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dummydecoderplugin) - -# plugin header files -HEADERS += \ - dummydecoderplugin.h - -# plugin source files -SOURCES += \ - dummydecoderplugin.cpp - -# plugin forms -FORMS += diff --git a/plugin/dummyviewerplugin/dummyviewerplugin.pro b/plugin/dummyviewerplugin/dummyviewerplugin.pro deleted file mode 100644 index a475afec..00000000 --- a/plugin/dummyviewerplugin/dummyviewerplugin.pro +++ /dev/null @@ -1,25 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(dummyviewerplugin) - -# plugin header files -HEADERS += \ - dummyviewerplugin.h \ - form.h - -# plugin source files -SOURCES += \ - dummyviewerplugin.cpp \ - form.cpp - -# plugin forms -FORMS += \ - form.ui diff --git a/plugin/filetransferplugin/filetransferplugin.pro b/plugin/filetransferplugin/filetransferplugin.pro deleted file mode 100644 index c57263f3..00000000 --- a/plugin/filetransferplugin/filetransferplugin.pro +++ /dev/null @@ -1,41 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -greaterThan(QT_VER_MAJ, 4) { - QT += printsupport -} - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(filetransferplugin) - -# plugin header files -HEADERS += \ - filetransferplugin.h \ - form.h \ - file.h \ - imagepreviewdialog.h \ - textviewdialog.h \ - globals.h \ - configuration.h - -# plugin source files -SOURCES += \ - filetransferplugin.cpp \ - form.cpp \ - file.cpp \ - imagepreviewdialog.cpp \ - textviewdialog.cpp \ - configuration.cpp - -# plugin forms -FORMS += \ - form.ui \ - imagepreviewdialog.ui \ - textviewdialog.ui - diff --git a/plugin/nonverboseplugin/nonverboseplugin.pro b/plugin/nonverboseplugin/nonverboseplugin.pro deleted file mode 100644 index af73226b..00000000 --- a/plugin/nonverboseplugin/nonverboseplugin.pro +++ /dev/null @@ -1,26 +0,0 @@ -# include global settings for all DLT Viewer Plugins -include( ../plugin.pri ) - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# target name -TARGET = $$qtLibraryTarget(nonverboseplugin) - -# plugin header files -HEADERS += \ - nonverboseplugin.h - -# plugin source files -SOURCES += \ - nonverboseplugin.cpp - -# plugin forms -FORMS += - -# other files -OTHER_FILES += \ - dlt-example-non-verbose-1.xml diff --git a/plugin/plugin.pro b/plugin/plugin.pro deleted file mode 100644 index 2ad298a8..00000000 --- a/plugin/plugin.pro +++ /dev/null @@ -1,5 +0,0 @@ -# -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += dltviewerplugin nonverboseplugin filetransferplugin dltsystemviewerplugin dummycontrolplugin dummyviewerplugin dummycommandplugin dummydecoderplugin dltdbusplugin dltlogstorageplugin dlttestrobotplugin dltsegmentationplugin diff --git a/qdlt/qdlt.pro b/qdlt/qdlt.pro deleted file mode 100644 index 978c5d6f..00000000 --- a/qdlt/qdlt.pro +++ /dev/null @@ -1,115 +0,0 @@ - -PROJECT = qdlt -TEMPLATE = lib - -CONFIG += c++1z -DEFINES += QDLT_LIBRARY -*-gcc* { - QMAKE_CFLAGS += -std=gnu99 - QMAKE_CFLAGS += -Wall - QMAKE_CFLAGS += -Wextra -} - -*-g++* { - QMAKE_CXXFLAGS += -std=c++17 - QMAKE_CXXFLAGS += -Wall - QMAKE_CXXFLAGS += -Wextra - QMAKE_CXXFLAGS += -DPLUGIN_INSTALLATION_PATH=\\\"$$PREFIX/usr/share/dlt-viewer/plugins\\\" -} - -unix:DEFINES += BYTE_ORDER=LITTLE_ENDIAN _TTY_POSIX_ QT_VIEWER -win32:DEFINES += BYTE_ORDER=LITTLE_ENDIAN QT_VIEWER - -headers.path = $$PREFIX/usr/include/qdlt -headers.files = *.h - -INSTALLS += headers - -target.path = $$PREFIX/$$[QT_INSTALL_LIBS] -INSTALLS += target - -CONFIG += warn_on qt -QT += network -QT += serialport - -win32:LIBS += User32.lib - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -INCLUDEPATH = . ../src - -SOURCES += \ - dlt_common.c \ - qdltipconnection.cpp \ - qdltmessagedecoder.cpp \ - qdlttcpconnection.cpp \ - qdltudpconnection.cpp \ - qdltserialconnection.cpp \ - qdltmsg.cpp \ - qdltfilter.cpp \ - qdltfile.cpp \ - qdltcontrol.cpp \ - qdltconnection.cpp \ - qdltbase.cpp \ - qdltargument.cpp \ - qdltfilterlist.cpp \ - qdltfilterindex.cpp \ - qdltdefaultfilter.cpp \ - qdltpluginmanager.cpp \ - qdltplugin.cpp \ - qdltoptmanager.cpp \ - qdltsegmentedmsg.cpp \ - qdltsettingsmanager.cpp \ - qdltexporter.cpp \ - fieldnames.cpp \ - qdltimporter.cpp \ - dltmessagematcher.cpp \ - -HEADERS += qdlt.h \ - export_rules.h \ - dlt_common.h \ - dlt_user.h \ - qdltipconnection.h \ - qdltmessagedecoder.h \ - qdlttcpconnection.h \ - qdltudpconnection.h \ - qdltserialconnection.h \ - qdltmsg.h \ - qdltfilter.h \ - qdltfile.h \ - qdltcontrol.h \ - qdltconnection.h \ - qdltbase.h \ - qdltargument.h \ - qdltfilterlist.h \ - qdltfilterindex.h \ - qdltdefaultfilter.h \ - plugininterface.h \ - qdltpluginmanager.h \ - qdltplugin.h \ - dlt_types.h \ - dlt_protocol.h \ - qdltoptmanager.h \ - qdltsegmentedmsg.h \ - qdltsettingsmanager.h \ - qdltexporter.h \ - fieldnames.h \ - qdltimporter.h \ - dltmessagematcher.h \ - -unix:VERSION = 1.0.0 - -CONFIG(debug, debug|release) { - DESTDIR = ../debug - TARGET = qdltd - QMAKE_LIBDIR += ../debug -} -else { - DESTDIR = ../release - TARGET = qdlt - QMAKE_LIBDIR += ../release -} diff --git a/sdk/BuildPlugins.pro b/sdk/BuildPlugins.pro deleted file mode 100644 index b6acc5a0..00000000 --- a/sdk/BuildPlugins.pro +++ /dev/null @@ -1,5 +0,0 @@ -# -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += dummyviewerplugin dummydecoderplugin dummycontrolplugin diff --git a/sdk/dummycontrolplugin.pro b/sdk/dummycontrolplugin.pro deleted file mode 100644 index b6d0a697..00000000 --- a/sdk/dummycontrolplugin.pro +++ /dev/null @@ -1,38 +0,0 @@ -TEMPLATE = lib - -CONFIG += plugin - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -CONFIG(debug, debug|release) { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdltd -} -else { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdlt -} - -TARGET = $$qtLibraryTarget(dummycontrolplugin) - -# Defines and Header Directories -DEFINES += QT_VIEWER - -INCLUDEPATH += ../../include /usr/include/qdlt - -# Project files -HEADERS += dummycontrolplugin.h \ - form.h \ - ../../include/qdlt/qdlt.h \ - ../../include/qdlt/plugininterface.h - -SOURCES += dummycontrolplugin.cpp \ - form.cpp - -FORMS += form.ui diff --git a/sdk/dummydecoderplugin.pro b/sdk/dummydecoderplugin.pro deleted file mode 100644 index 9f54d8c9..00000000 --- a/sdk/dummydecoderplugin.pro +++ /dev/null @@ -1,34 +0,0 @@ -TEMPLATE = lib - -CONFIG += plugin - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -CONFIG(debug, debug|release) { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdltd -} -else { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdlt -} - -TARGET = $$qtLibraryTarget(dummydecoderplugin) - -# Defines and Header Directories -DEFINES += QT_VIEWER - -INCLUDEPATH += ../../include /usr/include/qdlt - -# Project files -HEADERS += dummydecoderplugin.h \ - ../../include/qdlt/qdlt.h \ - ../../include/qdlt/plugininterface.h - -SOURCES += dummydecoderplugin.cpp diff --git a/sdk/dummyviewerplugin.pro b/sdk/dummyviewerplugin.pro deleted file mode 100644 index 884c6d9c..00000000 --- a/sdk/dummyviewerplugin.pro +++ /dev/null @@ -1,38 +0,0 @@ -TEMPLATE = lib - -CONFIG += plugin - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -CONFIG(debug, debug|release) { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdltd -} -else { - DESTDIR = ../../../plugins - QMAKE_LIBDIR += ../../lib - LIBS += -lqdlt -} - -TARGET = $$qtLibraryTarget(dummyviewerplugin) - -# Defines and Header Directories -DEFINES += QT_VIEWER - -INCLUDEPATH += ../../include /usr/include/qdlt - -# Project files -HEADERS += dummyviewerplugin.h \ - form.h \ - ../../include/qdlt/qdlt.h \ - ../../include/qdlt/plugininterface.h - -SOURCES += dummyviewerplugin.cpp \ - form.cpp - -FORMS += form.ui diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 3b42f1ea..00000000 --- a/src/src.pro +++ /dev/null @@ -1,221 +0,0 @@ -# Helpers to detect QT version -QT_VERSION = $$[QT_VERSION] -QT_VERSION = $$split(QT_VERSION, ".") -QT_VER_MAJ = $$member(QT_VERSION, 0) -QT_VER_MIN = $$member(QT_VERSION, 1) - -CONFIG += c++1z -*-gcc* { - QMAKE_CFLAGS += -std=c11 - QMAKE_CFLAGS += -Wall - QMAKE_CFLAGS += -Wextra - #QMAKE_CXXFLAGS += -pedantic -} - -*-g++* { - QMAKE_CXXFLAGS += -std=c++17 - QMAKE_CXXFLAGS += -Wall - QMAKE_CXXFLAGS += -Wextra - #QMAKE_CXXFLAGS += -pedantic -} - -CONFIG += console - -macx { - QMAKE_LFLAGS += -Wl,-rpath . -} else { - QMAKE_LFLAGS += -Wl,-rpath=. -} - -# Uncomment to add debug symbols to Release build -#QMAKE_CXXFLAGS_RELEASE += -g -#QMAKE_CFLAGS_RELEASE += -g -#QMAKE_LFLAGS_RELEASE = - -# Compile time defines -unix:DEFINES += BYTE_ORDER=LITTLE_ENDIAN _TTY_POSIX_ QT_VIEWER -win32:DEFINES += BYTE_ORDER=LITTLE_ENDIAN QT_VIEWER - -# Local includes -INCLUDEPATH = . ../qdlt - -# Icon for application (The smiley face) -icons.files = resources/icon/org.genivi.DLTViewer.ico -icons_16x16.files = resources/icon/16x16/org.genivi.DLTViewer.png -icons_22x22.files = resources/icon/22x22/org.genivi.DLTViewer.png -icons_24x24.files = resources/icon/24x24/org.genivi.DLTViewer.png -icons_32x32.files = resources/icon/32x32/org.genivi.DLTViewer.png -icons_48x48.files = resources/icon/48x48/org.genivi.DLTViewer.png -icons_256x256.files = resources/icon/256x256/org.genivi.DLTViewer.png -icons_symbolic.files = resources/icon/symbolic/org.genivi.DLTViewer-symbolic.svg - -icons.path = $$PREFIX/usr/share/pixmaps -icons_16x16.path = $$PREFIX/usr/share/icons/hicolor/16x16/apps -icons_22x22.path = $$PREFIX/usr/share/icons/hicolor/22x22/apps -icons_24x24.path = $$PREFIX/usr/share/icons/hicolor/24x24/apps -icons_32x32.path = $$PREFIX/usr/share/icons/hicolor/32x32/apps -icons_48x48.path = $$PREFIX/usr/share/icons/hicolor/48x48/apps -icons_256x256.path = $$PREFIX/usr/share/icons/hicolor/256x256/apps -icons_symbolic.path = $$PREFIX/usr/share/icons/hicolor/symbolic/apps - -INSTALLS += icons icons_16x16 icons_22x22 icons_24x24 icons_32x32 icons_48x48 icons_256x256 icons_symbolic - -# desktop file to show the application in start menu on Linux -# This should work on both KDE and Gnome -desktop.path = $$PREFIX/usr/share/applications -desktop.files = resources/org.genivi.DLTViewer.desktop -INSTALLS += desktop - -# Unix header exports -headers.path = $$PREFIX/usr/include/dlt-viewer -headers.files = plugininterface.h -INSTALLS += headers - -# Unix executable install path -target.path = $$PREFIX/usr/bin -INSTALLS += target - -# Building an app bundle for macx is not so easy, hence disable it -# for development build -macx:CONFIG -= app_bundle - -# Library definitions for debug and release builds -CONFIG(debug, debug|release) { - DESTDIR = ../debug - QMAKE_CXXFLAGS += -g - QMAKE_CFLAGS += -g - QMAKE_LIBDIR += ../debug - LIBS += -lqdltd -} else { - DESTDIR = ../release - QMAKE_LIBDIR += ../release - LIBS += -lqdlt - QMAKE_RPATHDIR += ../build/release -} - -win32-g++ { - LIBS += -lws2_32 -} - -# QT Features to be linked in -QT += core gui network serialport - -# Detect QT5 and comply to new Widgets hierarchy -greaterThan(QT_VERSION, 4.8.4) { - QT += widgets - INCLUDEPATH += QtWidgets - win32:DEFINES += QT5_QT6_COMPAT -} - -# Put intermediate files in the build directory -MOC_DIR = build/moc -OBJECTS_DIR = build/obj -RCC_DIR = build/rcc -UI_DIR = build/ui - -# Executable name -TARGET = dlt-viewer - -# This is an application -TEMPLATE = app - -# Compile these sources -SOURCES += main.cpp \ - mainwindow.cpp \ - project.cpp \ - ecudialog.cpp \ - applicationdialog.cpp \ - contextdialog.cpp \ - filterdialog.cpp \ - plugindialog.cpp \ - settingsdialog.cpp \ - injectiondialog.cpp \ - searchdialog.cpp \ - searchform.cpp \ - multiplecontextdialog.cpp \ - sortfilterproxymodel.cpp \ - tablemodel.cpp \ - filtertreewidget.cpp \ - dltfileutils.cpp \ - dltfileindexer.cpp \ - dlttableview.cpp \ - dltuiutils.cpp \ - workingdirectory.cpp \ - jumptodialog.cpp\ - searchtablemodel.cpp \ - pulsebutton.cpp \ - plugintreewidget.cpp \ - exporterdialog.cpp \ - dltmsgqueue.cpp \ - dltfileindexerthread.cpp \ - dltfileindexerdefaultfilterthread.cpp \ - -# Show these headers in the project -HEADERS += mainwindow.h \ - project.h \ - ecudialog.h \ - applicationdialog.h \ - contextdialog.h \ - filterdialog.h \ - plugindialog.h \ - settingsdialog.h \ - injectiondialog.h \ - searchdialog.h \ - searchform.h \ - sortfilterproxymodel.h \ - version.h \ - multiplecontextdialog.h \ - tablemodel.h \ - filtertreewidget.h \ - dltfileutils.h \ - dltfileindexer.h \ - dlttableview.h \ - workingdirectory.h \ - dltuiutils.h \ - jumptodialog.h \ - pulsebutton.h \ - searchtablemodel.h \ - plugintreewidget.h \ - exporterdialog.h \ - dltmsgqueue.h \ - dltfileindexerthread.h \ - dltfileindexerdefaultfilterthread.h \ - mcudpsocket.h - -# Compile these UI files -FORMS += mainwindow.ui \ - ecudialog.ui \ - applicationdialog.ui \ - contextdialog.ui \ - filterdialog.ui \ - plugindialog.ui \ - searchform.ui \ - settingsdialog.ui \ - injectiondialog.ui \ - searchdialog.ui \ - multiplecontextdialog.ui \ - jumptodialog.ui \ - exporterdialog.ui \ - -# Related files -OTHER_FILES += \ - ../AUTHORS \ - ../build_sdk_windows_qt5.bat \ - ../build_sdk_windows_qt5_MSVC.bat \ - ../INSTALL.txt \ - ../LICENSE.txt \ - ../MPL.txt \ - ../README.md \ - ../ReleaseNotes_Viewer.txt \ - -# This contains all the button graphics for toolbar -RESOURCES += resources/resource.qrc - -# Instructions to compile resources. -RC_FILE = resources/dlt_viewer.rc - -DISTFILES += \ - ../build_config.bat \ - ../build_sdk_windows_qt5_MSVC_cmake.bat \ - ../build_sdk_windows_qt5_MSVC_cmake_interactive.bat \ - ../build_sdk_windows_qt5_MSVC_interactive.bat From 25e304f1bad103f031b1e76a383a63899466e392 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Wed, 11 Dec 2024 16:38:43 +0100 Subject: [PATCH 2/3] Remove qmake build for darwin. Signed-off-by: Alexander Wenzel --- scripts/darwin/build_cmake.sh | 20 ++++++++++---------- scripts/linux/buildUbuntu20.sh | 4 ---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/scripts/darwin/build_cmake.sh b/scripts/darwin/build_cmake.sh index 4da052cb..3996bf6d 100755 --- a/scripts/darwin/build_cmake.sh +++ b/scripts/darwin/build_cmake.sh @@ -11,17 +11,17 @@ rm -rf "${SRC_DIR}/build" mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" -if [[ $(uname -m) == 'arm64' ]]; then - Qt5_DIR="/opt/homebrew/opt/qt@5" - echo "Build with cmake $(uname -m) $Qt5_DIR" - qmake ../BuildDltViewer.pro +#if [[ $(uname -m) == 'arm64' ]]; then +# Qt5_DIR="/opt/homebrew/opt/qt@5" +# echo "Build with cmake $(uname -m) $Qt5_DIR" +# qmake ../BuildDltViewer.pro # cmake .. -else - Qt5_DIR="/usr/local/opt/qt" - echo "Build with qmake $(uname -m) $Qt5_DIR" - qmake ../BuildDltViewer.pro - make -fi +#else +# Qt5_DIR="/usr/local/opt/qt" +# echo "Build with qmake $(uname -m) $Qt5_DIR" +# qmake ../BuildDltViewer.pro +# make +#fi #make diff --git a/scripts/linux/buildUbuntu20.sh b/scripts/linux/buildUbuntu20.sh index f625c5a2..edbe0f74 100755 --- a/scripts/linux/buildUbuntu20.sh +++ b/scripts/linux/buildUbuntu20.sh @@ -17,10 +17,6 @@ rm -rf "${SRC_DIR}/build" mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" -#echo Build with QMake -#qmake ../BuildDltViewer.pro -#make -j ${NPROC} - echo Cleanup rm -rf "${INSTALL_DIR}" rm -rf "${SRC_DIR}/build" From 924b339e359fc024774f3d1568aee7887813e94f Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Wed, 11 Dec 2024 16:46:02 +0100 Subject: [PATCH 3/3] Fix darwin ci. Update documentation. Signed-off-by: Alexander Wenzel --- .gitignore | 2 -- INSTALL.md | 5 +++-- doc/dlt_viewer_plugins_programming_guide.txt | 1 + doc/dlt_viewer_user_manual.tex | 3 +++ scripts/darwin/build_cmake.sh | 14 +++++++------- sdk/create_sdk.bat | 5 ----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e2f2ac01..ea174673 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,11 @@ .gitconfig CMakeLists.txt.user -*.pro.user build/ .project Makefile buildlib/ release/ .cproject -*.pro.user* .settings *.orig *~ diff --git a/INSTALL.md b/INSTALL.md index ba8bd19e..0167b861 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -6,7 +6,7 @@ Alexander Wenzel * Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019 * Tested with QT 5.15.2 (Windows), QT 6.7.3 (Windows), and Qt 5.15.13 (Ubuntu 24.04LTS Linux) -* Open project BuildDltViewer.pro in Qt Creator. +* Open project CMakeLists.txt in Qt Creator. * Ensure that build options point to correct QT and MSVC. * Build Release in Qt Creator or via CMake (see last). * Optional Linux: set the library path in Qt Creator: Add variable to Projects/Build Settings/Build Environment: LD_LIBRARY_PATH = . @@ -19,7 +19,7 @@ Alexander Wenzel * sudo apt install libqt5serialport5-dev * mkdir build * cd build -* qmake ../BuildDltViewer.pro +* cmake .. * make * sudo make install * sudo ldconfig @@ -129,6 +129,7 @@ Steps to follow: * mkdir build * cd build +* TODO: Change to cmake * /Qt/5.X/gcc_64/bin/qmake /BuildDltViewer.pro -r * make diff --git a/doc/dlt_viewer_plugins_programming_guide.txt b/doc/dlt_viewer_plugins_programming_guide.txt index 7cb2a3cb..fbb3e635 100644 --- a/doc/dlt_viewer_plugins_programming_guide.txt +++ b/doc/dlt_viewer_plugins_programming_guide.txt @@ -146,6 +146,7 @@ Q_EXPORT_PLUGIN2(dummyplugin, DummyPlugin); #endif ---- +TODO: Use cmake file instead. .dummyplugin.pro ---- # include global settings for all DLT Viewer Plugins diff --git a/doc/dlt_viewer_user_manual.tex b/doc/dlt_viewer_user_manual.tex index 8e365279..fa97e451 100644 --- a/doc/dlt_viewer_user_manual.tex +++ b/doc/dlt_viewer_user_manual.tex @@ -2104,6 +2104,7 @@ \subsection{Linux} \subsubsection{qmake} +TODO: Use cmake file instead. Now add the plugin to plugins/plugin.pro \begin{verbatim} @@ -2112,6 +2113,7 @@ \subsubsection{qmake} Build the Viewer: \begin{verbatim} +TODO: Use cmake file instead. qmake BuildDltViewer.pro make \end{verbatim} @@ -2161,6 +2163,7 @@ \subsubsection{Build qwt} C:\Qwt-6.1.3_2015_5.8_64bit \end{verbatim} +TODO: Use cmake file instead. \subsubsection{Build Viewer using qmake} Now add the plugin to plugins/plugin.pro diff --git a/scripts/darwin/build_cmake.sh b/scripts/darwin/build_cmake.sh index 3996bf6d..0769a983 100755 --- a/scripts/darwin/build_cmake.sh +++ b/scripts/darwin/build_cmake.sh @@ -11,17 +11,17 @@ rm -rf "${SRC_DIR}/build" mkdir -p "${BUILD_DIR}" cd "${BUILD_DIR}" -#if [[ $(uname -m) == 'arm64' ]]; then -# Qt5_DIR="/opt/homebrew/opt/qt@5" -# echo "Build with cmake $(uname -m) $Qt5_DIR" +if [[ $(uname -m) == 'arm64' ]]; then + Qt5_DIR="/opt/homebrew/opt/qt@5" + echo "Build with cmake $(uname -m) $Qt5_DIR" # qmake ../BuildDltViewer.pro # cmake .. -#else -# Qt5_DIR="/usr/local/opt/qt" -# echo "Build with qmake $(uname -m) $Qt5_DIR" +else + Qt5_DIR="/usr/local/opt/qt" + echo "Build with qmake $(uname -m) $Qt5_DIR" # qmake ../BuildDltViewer.pro # make -#fi +fi #make diff --git a/sdk/create_sdk.bat b/sdk/create_sdk.bat index b96b425a..78c14a0c 100644 --- a/sdk/create_sdk.bat +++ b/sdk/create_sdk.bat @@ -50,8 +50,3 @@ copy %BUILD_DIR%\libqdlt.a %TARGET_DIR%\sdk\lib copy %SOURCE_DIR%\plugin\dummyviewerplugin %TARGET_DIR%\sdk\src\dummyviewerplugin copy %SOURCE_DIR%\plugin\dummydecoderplugin %TARGET_DIR%\sdk\src\dummydecoderplugin copy %SOURCE_DIR%\plugin\dummycontrolplugin %TARGET_DIR%\sdk\src\dummycontrolplugin - -copy %SOURCE_DIR%\sdk\BuildPlugins.pro %TARGET_DIR%\sdk\src -copy %SOURCE_DIR%\sdk\dummydecoderplugin.pro %TARGET_DIR%\sdk\src\dummydecoderplugin -copy %SOURCE_DIR%\sdk\dummyviewerplugin.pro %TARGET_DIR%\sdk\src\dummyviewerplugin -copy %SOURCE_DIR%\sdk\dummycontrolplugin.pro %TARGET_DIR%\sdk\src\dummycontrolplugin