From 7ece093ee9064f827624c06bab511c8c72a62031 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Mon, 23 Nov 2015 09:50:44 +0100 Subject: [PATCH] Refactor qmake SUBDIRS structure The big swift.pro is refactored by the correct usage of SUBDIRS template. The following additional changes are made: - Removed '_' from all targets and folder names - Aligned parent folder and target name refs #461 --- docs/{doxygen.pro => docs.pro} | 0 .../{swiftresources.pro => resources.pro} | 0 .../{sample_blackmisc.pro => blackmisc.pro} | 2 +- ...e_blackmisc_dbus.pro => blackmiscdbus.pro} | 2 +- samples/blackmiscdbus/servicetool.cpp | 2 +- ...interface.cpp => testserviceinterface.cpp} | 2 +- ...ice_interface.h => testserviceinterface.h} | 0 ...s_aviation.pro => blackmiscquantities.pro} | 2 +- ...ple_blackmisc_sim.pro => blackmiscsim.pro} | 2 +- .../cliclient.pro} | 2 +- samples/{cli_client => cliclient}/client.cpp | 0 samples/{cli_client => cliclient}/client.h | 0 samples/{cli_client => cliclient}/main.cpp | 0 samples/{cli_client => cliclient}/reader.cpp | 0 samples/{cli_client => cliclient}/reader.h | 0 .../hotkey/{sample_hotkey.pro => hotkey.pro} | 2 +- samples/samples.pro | 11 ++++ src/plugins/plugins.pro | 6 ++ .../simulator/fs9/{plugin_fs9.pro => fs9.pro} | 2 +- .../{plugin_fscommon.pro => fscommon.pro} | 2 +- .../simulator/fsx/{plugin_fsx.pro => fsx.pro} | 2 +- .../fsxconfig.pro} | 2 +- .../simconnectsettingscomponent.cpp | 0 .../simconnectsettingscomponent.h | 0 .../simconnectsettingscomponent.ui | 0 .../simulatorfsxconfig.cpp | 0 .../simulatorfsxconfig.h | 0 .../simulatorfsxconfig.json | 0 .../simulatorfsxconfigwindow.cpp | 0 .../simulatorfsxconfigwindow.h | 0 .../simulatorfsxconfigwindow.ui | 0 src/plugins/simulator/simulator.pro | 23 +++++++ .../simulator/xplane/simulatorxplane.h | 2 +- .../xplane/{plugin_xplane.pro => xplane.pro} | 2 +- .../simulatorxplaneconfig.cpp | 0 .../simulatorxplaneconfig.h | 0 .../simulatorxplaneconfig.json | 0 .../simulatorxplaneconfigwindow.cpp | 0 .../simulatorxplaneconfigwindow.h | 0 .../simulatorxplaneconfigwindow.ui | 0 .../xplaneconfig.pro} | 2 +- src/src.pro | 39 +++++++++++ swift.pro | 65 ++----------------- .../{test_blackcore.pro => blackcore.pro} | 2 +- .../{test_blackgui.pro => blackgui.pro} | 2 +- .../{test_blackmisc.pro => blackmisc.pro} | 2 +- tests/tests.pro | 8 +++ 47 files changed, 111 insertions(+), 77 deletions(-) rename docs/{doxygen.pro => docs.pro} (100%) rename resources/{swiftresources.pro => resources.pro} (100%) rename samples/blackmisc/{sample_blackmisc.pro => blackmisc.pro} (93%) rename samples/blackmiscdbus/{sample_blackmisc_dbus.pro => blackmiscdbus.pro} (92%) rename samples/blackmiscdbus/{testservice_interface.cpp => testserviceinterface.cpp} (95%) rename samples/blackmiscdbus/{testservice_interface.h => testserviceinterface.h} (100%) rename samples/blackmiscquantities/{sample_quantities_aviation.pro => blackmiscquantities.pro} (90%) rename samples/blackmiscsim/{sample_blackmisc_sim.pro => blackmiscsim.pro} (92%) rename samples/{cli_client/sample_cli_client.pro => cliclient/cliclient.pro} (92%) rename samples/{cli_client => cliclient}/client.cpp (100%) rename samples/{cli_client => cliclient}/client.h (100%) rename samples/{cli_client => cliclient}/main.cpp (100%) rename samples/{cli_client => cliclient}/reader.cpp (100%) rename samples/{cli_client => cliclient}/reader.h (100%) rename samples/hotkey/{sample_hotkey.pro => hotkey.pro} (94%) create mode 100644 samples/samples.pro create mode 100644 src/plugins/plugins.pro rename src/plugins/simulator/fs9/{plugin_fs9.pro => fs9.pro} (96%) rename src/plugins/simulator/fscommon/{plugin_fscommon.pro => fscommon.pro} (92%) rename src/plugins/simulator/fsx/{plugin_fsx.pro => fsx.pro} (96%) rename src/plugins/simulator/{fsx_config/plugin_fsx_config.pro => fsxconfig/fsxconfig.pro} (94%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simconnectsettingscomponent.cpp (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simconnectsettingscomponent.h (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simconnectsettingscomponent.ui (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfig.cpp (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfig.h (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfig.json (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfigwindow.cpp (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfigwindow.h (100%) rename src/plugins/simulator/{fsx_config => fsxconfig}/simulatorfsxconfigwindow.ui (100%) create mode 100644 src/plugins/simulator/simulator.pro rename src/plugins/simulator/xplane/{plugin_xplane.pro => xplane.pro} (94%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfig.cpp (100%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfig.h (100%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfig.json (100%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfigwindow.cpp (100%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfigwindow.h (100%) rename src/plugins/simulator/{xplane_config => xplaneconfig}/simulatorxplaneconfigwindow.ui (100%) rename src/plugins/simulator/{xplane_config/plugin_xplane_config.pro => xplaneconfig/xplaneconfig.pro} (93%) create mode 100644 src/src.pro rename tests/blackcore/{test_blackcore.pro => blackcore.pro} (93%) rename tests/blackgui/{test_blackgui.pro => blackgui.pro} (94%) rename tests/blackmisc/{test_blackmisc.pro => blackmisc.pro} (93%) create mode 100644 tests/tests.pro diff --git a/docs/doxygen.pro b/docs/docs.pro similarity index 100% rename from docs/doxygen.pro rename to docs/docs.pro diff --git a/resources/swiftresources.pro b/resources/resources.pro similarity index 100% rename from resources/swiftresources.pro rename to resources/resources.pro diff --git a/samples/blackmisc/sample_blackmisc.pro b/samples/blackmisc/blackmisc.pro similarity index 93% rename from samples/blackmisc/sample_blackmisc.pro rename to samples/blackmisc/blackmisc.pro index cdc485740..744c9cef8 100644 --- a/samples/blackmisc/sample_blackmisc.pro +++ b/samples/blackmisc/blackmisc.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network -TARGET = sample_blackmisc +TARGET = sampleblackmisc TEMPLATE = app CONFIG += console diff --git a/samples/blackmiscdbus/sample_blackmisc_dbus.pro b/samples/blackmiscdbus/blackmiscdbus.pro similarity index 92% rename from samples/blackmiscdbus/sample_blackmisc_dbus.pro rename to samples/blackmiscdbus/blackmiscdbus.pro index 9587d1918..6e1923cea 100644 --- a/samples/blackmiscdbus/sample_blackmisc_dbus.pro +++ b/samples/blackmiscdbus/blackmiscdbus.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network -TARGET = sample_blackmisc_dbus +TARGET = sampleblackmiscdbus TEMPLATE = app CONFIG += console diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index f6f9bbc6c..45bd3838e 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -9,7 +9,7 @@ #include "servicetool.h" #include "testservice.h" -#include "testservice_interface.h" +#include "testserviceinterface.h" #include "blackcore/dbusserver.h" #include diff --git a/samples/blackmiscdbus/testservice_interface.cpp b/samples/blackmiscdbus/testserviceinterface.cpp similarity index 95% rename from samples/blackmiscdbus/testservice_interface.cpp rename to samples/blackmiscdbus/testserviceinterface.cpp index 226730c73..8071adafb 100644 --- a/samples/blackmiscdbus/testservice_interface.cpp +++ b/samples/blackmiscdbus/testserviceinterface.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "testservice_interface.h" +#include "testserviceinterface.h" namespace BlackMiscTest { diff --git a/samples/blackmiscdbus/testservice_interface.h b/samples/blackmiscdbus/testserviceinterface.h similarity index 100% rename from samples/blackmiscdbus/testservice_interface.h rename to samples/blackmiscdbus/testserviceinterface.h diff --git a/samples/blackmiscquantities/sample_quantities_aviation.pro b/samples/blackmiscquantities/blackmiscquantities.pro similarity index 90% rename from samples/blackmiscquantities/sample_quantities_aviation.pro rename to samples/blackmiscquantities/blackmiscquantities.pro index 6a4b1c99e..282d81a63 100644 --- a/samples/blackmiscquantities/sample_quantities_aviation.pro +++ b/samples/blackmiscquantities/blackmiscquantities.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network -TARGET = sample_quantities_aviation +TARGET = sampleblackmiscquantities TEMPLATE = app CONFIG += console diff --git a/samples/blackmiscsim/sample_blackmisc_sim.pro b/samples/blackmiscsim/blackmiscsim.pro similarity index 92% rename from samples/blackmiscsim/sample_blackmisc_sim.pro rename to samples/blackmiscsim/blackmiscsim.pro index 4f745657e..a8bc1d7ee 100644 --- a/samples/blackmiscsim/sample_blackmisc_sim.pro +++ b/samples/blackmiscsim/blackmiscsim.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network xml -TARGET = sample_blacksim +TARGET = sampleblackmiscsim TEMPLATE = app CONFIG += console diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cliclient/cliclient.pro similarity index 92% rename from samples/cli_client/sample_cli_client.pro rename to samples/cliclient/cliclient.pro index cb6d72b35..4f2d05c24 100644 --- a/samples/cli_client/sample_cli_client.pro +++ b/samples/cliclient/cliclient.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network -TARGET = sample_cli_client +TARGET = samplecliclient TEMPLATE = app CONFIG += console diff --git a/samples/cli_client/client.cpp b/samples/cliclient/client.cpp similarity index 100% rename from samples/cli_client/client.cpp rename to samples/cliclient/client.cpp diff --git a/samples/cli_client/client.h b/samples/cliclient/client.h similarity index 100% rename from samples/cli_client/client.h rename to samples/cliclient/client.h diff --git a/samples/cli_client/main.cpp b/samples/cliclient/main.cpp similarity index 100% rename from samples/cli_client/main.cpp rename to samples/cliclient/main.cpp diff --git a/samples/cli_client/reader.cpp b/samples/cliclient/reader.cpp similarity index 100% rename from samples/cli_client/reader.cpp rename to samples/cliclient/reader.cpp diff --git a/samples/cli_client/reader.h b/samples/cliclient/reader.h similarity index 100% rename from samples/cli_client/reader.h rename to samples/cliclient/reader.h diff --git a/samples/hotkey/sample_hotkey.pro b/samples/hotkey/hotkey.pro similarity index 94% rename from samples/hotkey/sample_hotkey.pro rename to samples/hotkey/hotkey.pro index ab459b315..f43df5358 100644 --- a/samples/hotkey/sample_hotkey.pro +++ b/samples/hotkey/hotkey.pro @@ -4,7 +4,7 @@ QT += core gui dbus network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = sample_hotkey +TARGET = samplehotkey TEMPLATE = app CONFIG -= app_bundle diff --git a/samples/samples.pro b/samples/samples.pro new file mode 100644 index 000000000..0d149ca77 --- /dev/null +++ b/samples/samples.pro @@ -0,0 +1,11 @@ +load(common_pre) + +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS += cliclient +SUBDIRS += blackmiscquantities +SUBDIRS += blackmiscdbus +SUBDIRS += blackmisc +SUBDIRS += blackmiscsim +SUBDIRS += hotkey diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro new file mode 100644 index 000000000..35ba31dca --- /dev/null +++ b/src/plugins/plugins.pro @@ -0,0 +1,6 @@ +load(common_pre) + +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS += simulator diff --git a/src/plugins/simulator/fs9/plugin_fs9.pro b/src/plugins/simulator/fs9/fs9.pro similarity index 96% rename from src/plugins/simulator/fs9/plugin_fs9.pro rename to src/plugins/simulator/fs9/fs9.pro index 154f1fd68..c10b73a02 100644 --- a/src/plugins/simulator/fs9/plugin_fs9.pro +++ b/src/plugins/simulator/fs9/fs9.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus gui network concurrent xml -TARGET = simulator_fs9 +TARGET = simulatorfs9 TEMPLATE = lib CONFIG += plugin shared diff --git a/src/plugins/simulator/fscommon/plugin_fscommon.pro b/src/plugins/simulator/fscommon/fscommon.pro similarity index 92% rename from src/plugins/simulator/fscommon/plugin_fscommon.pro rename to src/plugins/simulator/fscommon/fscommon.pro index 48ce9f47d..7dd7e6858 100644 --- a/src/plugins/simulator/fscommon/plugin_fscommon.pro +++ b/src/plugins/simulator/fscommon/fscommon.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus concurrent xml -TARGET = simulator_fscommon +TARGET = simulatorfscommon TEMPLATE = lib CONFIG += staticlib diff --git a/src/plugins/simulator/fsx/plugin_fsx.pro b/src/plugins/simulator/fsx/fsx.pro similarity index 96% rename from src/plugins/simulator/fsx/plugin_fsx.pro rename to src/plugins/simulator/fsx/fsx.pro index fe4c585c7..a2160c36a 100644 --- a/src/plugins/simulator/fsx/plugin_fsx.pro +++ b/src/plugins/simulator/fsx/fsx.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus gui network concurrent xml -TARGET = simulator_fsx +TARGET = simulatorfsx TEMPLATE = lib CONFIG += plugin shared diff --git a/src/plugins/simulator/fsx_config/plugin_fsx_config.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro similarity index 94% rename from src/plugins/simulator/fsx_config/plugin_fsx_config.pro rename to src/plugins/simulator/fsxconfig/fsxconfig.pro index 67f1edf7c..d41407db9 100644 --- a/src/plugins/simulator/fsx_config/plugin_fsx_config.pro +++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core widgets dbus network -TARGET = simulator_fsx_config +TARGET = simulatorfsxconfig TEMPLATE = lib CONFIG += plugin shared CONFIG += blackmisc blackcore blackgui diff --git a/src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp b/src/plugins/simulator/fsxconfig/simconnectsettingscomponent.cpp similarity index 100% rename from src/plugins/simulator/fsx_config/simconnectsettingscomponent.cpp rename to src/plugins/simulator/fsxconfig/simconnectsettingscomponent.cpp diff --git a/src/plugins/simulator/fsx_config/simconnectsettingscomponent.h b/src/plugins/simulator/fsxconfig/simconnectsettingscomponent.h similarity index 100% rename from src/plugins/simulator/fsx_config/simconnectsettingscomponent.h rename to src/plugins/simulator/fsxconfig/simconnectsettingscomponent.h diff --git a/src/plugins/simulator/fsx_config/simconnectsettingscomponent.ui b/src/plugins/simulator/fsxconfig/simconnectsettingscomponent.ui similarity index 100% rename from src/plugins/simulator/fsx_config/simconnectsettingscomponent.ui rename to src/plugins/simulator/fsxconfig/simconnectsettingscomponent.ui diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfig.cpp b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfig.cpp rename to src/plugins/simulator/fsxconfig/simulatorfsxconfig.cpp diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfig.h b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.h similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfig.h rename to src/plugins/simulator/fsxconfig/simulatorfsxconfig.h diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfig.json b/src/plugins/simulator/fsxconfig/simulatorfsxconfig.json similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfig.json rename to src/plugins/simulator/fsxconfig/simulatorfsxconfig.json diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.cpp b/src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.cpp similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.cpp rename to src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.cpp diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.h b/src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.h similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.h rename to src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.h diff --git a/src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.ui b/src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.ui similarity index 100% rename from src/plugins/simulator/fsx_config/simulatorfsxconfigwindow.ui rename to src/plugins/simulator/fsxconfig/simulatorfsxconfigwindow.ui diff --git a/src/plugins/simulator/simulator.pro b/src/plugins/simulator/simulator.pro new file mode 100644 index 000000000..f4a4e6412 --- /dev/null +++ b/src/plugins/simulator/simulator.pro @@ -0,0 +1,23 @@ +load(common_pre) + +TEMPLATE = subdirs +CONFIG += ordered + +win32 { + if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) { + SUBDIRS += fscommon + } + + contains(BLACK_CONFIG, FSX) { + SUBDIRS += fsx + SUBDIRS += fsxconfig + } + contains(BLACK_CONFIG, FS9) { + SUBDIRS += fs9 + } +} + +contains(BLACK_CONFIG, XPlane) { + SUBDIRS += xplane + SUBDIRS += xplaneconfig +} diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index 39b3b13e4..b5de2dfec 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -17,7 +17,7 @@ #include "blackmisc/simulation/ownaircraftprovider.h" #include "blackmisc/simulation/aircraftmodellist.h" #include "blackmisc/pixmap.h" -#include "plugins/simulator/xplane_config/simulatorxplaneconfig.h" +#include "plugins/simulator/xplaneconfig/simulatorxplaneconfig.h" #include class QDBusServiceWatcher; diff --git a/src/plugins/simulator/xplane/plugin_xplane.pro b/src/plugins/simulator/xplane/xplane.pro similarity index 94% rename from src/plugins/simulator/xplane/plugin_xplane.pro rename to src/plugins/simulator/xplane/xplane.pro index 78fab4879..d775ffb49 100644 --- a/src/plugins/simulator/xplane/plugin_xplane.pro +++ b/src/plugins/simulator/xplane/xplane.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core dbus network -TARGET = simulator_xplane +TARGET = simulatorxplane TEMPLATE = lib CONFIG += plugin shared diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfig.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfig.cpp rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.cpp diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfig.h rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfig.json b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.json similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfig.json rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.json diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.cpp rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.h rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.h diff --git a/src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui similarity index 100% rename from src/plugins/simulator/xplane_config/simulatorxplaneconfigwindow.ui rename to src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui diff --git a/src/plugins/simulator/xplane_config/plugin_xplane_config.pro b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro similarity index 93% rename from src/plugins/simulator/xplane_config/plugin_xplane_config.pro rename to src/plugins/simulator/xplaneconfig/xplaneconfig.pro index e28bb6993..80a10923d 100644 --- a/src/plugins/simulator/xplane_config/plugin_xplane_config.pro +++ b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core widgets dbus -TARGET = simulator_xplane_config +TARGET = simulatorxplaneconfig TEMPLATE = lib CONFIG += plugin shared diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 000000000..f640b5bc4 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,39 @@ +load(common_pre) + +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS += blackmisc + +contains(BLACK_CONFIG, BlackSound) { + SUBDIRS += blacksound +} + +contains(BLACK_CONFIG, BlackInput) { + SUBDIRS += blackinput +} + +contains(BLACK_CONFIG, BlackCore) { + SUBDIRS += blackcore + contains(BLACK_CONFIG, BlackGui) { + SUBDIRS += blackgui + contains(BLACK_CONFIG, SwiftGui) { + SUBDIRS += swiftguistandard + } + contains(BLACK_CONFIG, SwiftCore) { + SUBDIRS += swiftcore + } + contains(BLACK_CONFIG, SwiftData) { + SUBDIRS += swiftdata + } + contains(BLACK_CONFIG, SwiftLauncher) { + SUBDIRS += swiftlauncher + } + } +} + +contains(BLACK_CONFIG, XPlane) { + SUBDIRS += xbus/xbus.pro +} + +SUBDIRS += plugins diff --git a/swift.pro b/swift.pro index 71f19c99d..3c87f5bfa 100644 --- a/swift.pro +++ b/swift.pro @@ -3,75 +3,22 @@ load(common_pre) TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += src/blackmisc -SUBDIRS += resources/swiftresources.pro OTHER_FILES += mkspecs/features/*.prf OTHER_FILES += mkspecs/features/*.pri -contains(BLACK_CONFIG, BlackSound) { - SUBDIRS += src/blacksound +contains(BLACK_CONFIG, Doxygen) { +SUBDIRS += docs } -contains(BLACK_CONFIG, BlackInput) { - SUBDIRS += src/blackinput -} - -contains(BLACK_CONFIG, BlackCore) { - SUBDIRS += src/blackcore - contains(BLACK_CONFIG, BlackGui) { - SUBDIRS += src/blackgui - contains(BLACK_CONFIG, SwiftGui) { - SUBDIRS += src/swiftguistandard/swiftguistandard.pro - } - contains(BLACK_CONFIG, SwiftCore) { - SUBDIRS += src/swiftcore/swiftcore.pro - } - contains(BLACK_CONFIG, SwiftData) { - SUBDIRS += src/swiftdata/swiftdata.pro - } - contains(BLACK_CONFIG, SwiftLauncher) { - SUBDIRS += src/swiftlauncher/swiftlauncher.pro - } - } -} - -win32 { - if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) { - SUBDIRS += src/plugins/simulator/fscommon/plugin_fscommon.pro - } - - contains(BLACK_CONFIG, FSX) { - SUBDIRS += src/plugins/simulator/fsx/plugin_fsx.pro - SUBDIRS += src/plugins/simulator/fsx_config/plugin_fsx_config.pro - } - contains(BLACK_CONFIG, FS9) { - SUBDIRS += src/plugins/simulator/fs9/plugin_fs9.pro - } -} - -contains(BLACK_CONFIG, XPlane) { - SUBDIRS += src/xbus/xbus.pro - SUBDIRS += src/plugins/simulator/xplane/plugin_xplane.pro - SUBDIRS += src/plugins/simulator/xplane_config/plugin_xplane_config.pro -} +SUBDIRS += resources +SUBDIRS += src contains(BLACK_CONFIG, Samples) { - SUBDIRS += samples/cli_client/sample_cli_client.pro - SUBDIRS += samples/blackmiscquantities/sample_quantities_aviation.pro - SUBDIRS += samples/blackmiscdbus/sample_blackmisc_dbus.pro - SUBDIRS += samples/blackmisc/sample_blackmisc.pro - SUBDIRS += samples/blackmiscsim/sample_blackmisc_sim.pro - SUBDIRS += samples/hotkey/sample_hotkey.pro + SUBDIRS += samples } contains(BLACK_CONFIG, Unittests) { - SUBDIRS += tests/blackmisc/test_blackmisc.pro - SUBDIRS += tests/blackcore/test_blackcore.pro - SUBDIRS += tests/blackgui/test_blackgui.pro -} - -contains(BLACK_CONFIG, Doxygen) { - SUBDIRS += docs/doxygen.pro + SUBDIRS += tests } include(install.pri) diff --git a/tests/blackcore/test_blackcore.pro b/tests/blackcore/blackcore.pro similarity index 93% rename from tests/blackcore/test_blackcore.pro rename to tests/blackcore/blackcore.pro index a0949cf8f..5f2314a90 100644 --- a/tests/blackcore/test_blackcore.pro +++ b/tests/blackcore/blackcore.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core testlib dbus network -TARGET = test_blackcore +TARGET = testblackcore TEMPLATE = app CONFIG += console diff --git a/tests/blackgui/test_blackgui.pro b/tests/blackgui/blackgui.pro similarity index 94% rename from tests/blackgui/test_blackgui.pro rename to tests/blackgui/blackgui.pro index 366d8ea3f..15abd85fb 100644 --- a/tests/blackgui/test_blackgui.pro +++ b/tests/blackgui/blackgui.pro @@ -3,7 +3,7 @@ load(common_pre) QT += core testlib dbus network gui svg greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = test_blackgui +TARGET = testblackgui TEMPLATE = app CONFIG -= app_bundle diff --git a/tests/blackmisc/test_blackmisc.pro b/tests/blackmisc/blackmisc.pro similarity index 93% rename from tests/blackmisc/test_blackmisc.pro rename to tests/blackmisc/blackmisc.pro index 2a12beeac..532692613 100644 --- a/tests/blackmisc/test_blackmisc.pro +++ b/tests/blackmisc/blackmisc.pro @@ -2,7 +2,7 @@ load(common_pre) QT += core testlib dbus network -TARGET = test_blackmisc +TARGET = testblackmisc TEMPLATE = app CONFIG += console diff --git a/tests/tests.pro b/tests/tests.pro new file mode 100644 index 000000000..f3a4eb777 --- /dev/null +++ b/tests/tests.pro @@ -0,0 +1,8 @@ +load(common_pre) + +TEMPLATE = subdirs +CONFIG += ordered + +SUBDIRS += blackmisc +SUBDIRS += blackcore +SUBDIRS += blackgui