replace qpmx by qdep (WIP)

Author: Skycoder42

README.md

@@ -60,11 +60,8 @@ A simple offline-first synchronisation framework, to synchronize data of Qt appl
 3. Download the compiled modules from the release page. **Note:** You will have to add the correct ones yourself and may need to adjust some paths to fit your installation! In addition to that, you will have to download the modules this one depends on as well. See Section "Requirements" below.
 4. Build it yourself! **Note:** This requires all build an runtime dependencies to be available (See Section "Requirements" below). If you don't have/need cmake, you can ignore the related warnings. To automatically build and install to your Qt installation, run:
 	- `qmake`
-	- `make qmake_all`
 	- `make` (If you want the tests/examples/etc. run `make all`)
-	- Optional steps:
-		- `make doxygen` to generate the documentation
-		- `make lrelease` to generate the translations
+	- Optional step: `make doxygen` to generate the documentation
 	- `make install`
 
 ## Requirements

mkspecs/features/qtdatasync_androidkeystore.prf

@@ -8,12 +8,6 @@ doxygen.recurse_target = doxygen
 doxygen.recurse += doc
 QMAKE_EXTRA_TARGETS += doxygen
 
-lrelease.target = lrelease
-lrelease.CONFIG = recursive
-lrelease.recurse_target = lrelease
-lrelease.recurse += sub_src sub_tools
-QMAKE_EXTRA_TARGETS += lrelease
-
 runtests.target = run-tests
 runtests.CONFIG = recursive
 runtests.recurse_target = run-tests

qtdatasync.pro

@@ -2,6 +2,3 @@ TEMPLATE = subdirs
 
 system_cryptopp:unix: message("Not building cryptopp, using system provided version")
 else: SUBDIRS += cryptopp
-
-prepareRecursiveTarget(lrelease)
-QMAKE_EXTRA_TARGETS += lrelease

src/3rdparty/3rdparty.pro

@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += static
 CONFIG -= qt
 
 TARGET = qtcryptopp
@@ -9,7 +9,7 @@ win32:!win32-g++ {
 	MODULE_DEFINES += CRYPTOPP_DISABLE_ASM #TODO reenable again later
 	cross_compile: MODULE_DEFINES += NO_OS_DEPENDENCE
 } else {
-        # based on https://github.com/KayEss/fost-crypto/blob/master/CMakeLists.txt
+		# based on https://github.com/KayEss/fost-crypto/blob/master/CMakeLists.txt
 	QMAKE_CXXFLAGS += -Wno-keyword-macro -Wno-unused-const-variable -Wno-unused-private-field
 
 	!isEmpty(ANDROID_TARGET_ARCH) {
@@ -70,5 +70,3 @@ HEADER_INSTALL_DIR = "$$MODULE_BASE_OUTDIR/include/cryptopp"
 MODULE_INCLUDEPATH += "$$MODULE_BASE_OUTDIR/include"
 
 load(qt_helper_lib)
-
-QMAKE_EXTRA_TARGETS += lrelease

src/3rdparty/cryptopp/cryptopp.pro

@@ -1,6 +1,7 @@
 TARGET = QtDataSync
 
 QT = core jsonserializer sql websockets scxml remoteobjects
+android: QT += androidextras
 
 HEADERS += \
 	qtdatasync_global.h \
@@ -92,21 +93,16 @@ TRANSLATIONS += \
 	translations/qtdatasync_de.ts \
 	translations/qtdatasync_template.ts
 
-DISTFILES += $$TRANSLATIONS
-
 include(rothreadedbackend/rothreadedbackend.pri)
 include(../messages/messages.pri)
 
 MODULE_CONFIG += c++14
-android: MODULE_CONFIG += qtdatasync_androidkeystore
 MODULE_PLUGIN_TYPES = keystores
 
 load(qt_module)
 
-android: FEATURES += ../../mkspecs/features/qtdatasync_androidkeystore.prf
-features.files = $$FEATURES
-features.path = $$[QT_HOST_DATA]/mkspecs/features/
-INSTALLS += features
+CONFIG += lrelease
+QM_FILES_INSTALL_PATH = $$[QT_INSTALL_TRANSLATIONS]
 
 win32 {
 	QMAKE_TARGET_PRODUCT = "QtDataSync"
@@ -117,9 +113,8 @@ win32 {
 	CONFIG -= c++1z #TODO remove later
 }
 
-qpmx_ts_target.path = $$[QT_INSTALL_TRANSLATIONS]
-qpmx_ts_target.depends += lrelease
-INSTALLS += qpmx_ts_target
+QDEP_DEPENDS += Skycoder42/QPluginFactory
+QDEP_LINK_DEPENDS += ../messages
 
 # extra cpp files for translations
 never_true_lupdate_only {
@@ -133,9 +128,8 @@ never_true_lupdate_only {
 	for(plugin, PLUGINS): SOURCES += $$plugin/*.cpp
 }
 
-!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.)
-else: include($$OUT_PWD/qpmx_generated.pri)
+!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")
 
 #replace template qm by ts
-qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtdatasync_template.qm
-qpmx_ts_target.files += translations/qtdatasync_template.ts
+QM_FILES -= $$__qdep_lrelease_real_dir/qtdatasync_template.qm
+QM_FILES += translations/qtdatasync_template.ts

src/datasync/datasync.pro

@@ -63,8 +63,8 @@ load(qt_helper_lib)
 CONFIG += qt warning_clean
 QT = core
 
-# dummy target, translations are all done in datasync
-QMAKE_EXTRA_TARGETS += lrelease
+QDEP_DEPENDS += Skycoder42/CryptoQQ
+QDEP_EXPORTS += Skycoder42/CryptoQQ
+CONFIG += qdep_no_link
 
-!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.)
-else: include($$OUT_PWD/qpmx_generated.pri)
+!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")

src/datasync/qpmx.json

@@ -2,10 +2,7 @@ TEMPLATE = subdirs
 
 SUBDIRS += plain
 qtHaveModule(KWallet): SUBDIRS += kwallet
-unix:!android:!ios:system(pkg-config --exists libsecret-1): SUBDIRS += secretservice
+unix:!android:!ios:packagesExist(libsecret-1): SUBDIRS += secretservice
 win32:!cross_compile: SUBDIRS += wincred
 mac|ios: SUBDIRS += keychain
 android:qtHaveModule(androidextras): SUBDIRS += android
-
-prepareRecursiveTarget(lrelease)
-QMAKE_EXTRA_TARGETS += lrelease

src/messages/messages.pro

@@ -12,28 +12,19 @@ datasync.depends += messages 3rdparty
 plugins.depends += datasync
 imports.depends += datasync
 
-imports.CONFIG += no_lrelease_target
-plugins.CONFIG += no_lrelease_target
-
 android {
 	SUBDIRS += datasyncandroid
 	!android-embedded: SUBDIRS += java
 
 	datasyncandroid.depends += datasync java
 	imports.depends += datasyncandroid
-
-	datasyncandroid.CONFIG += no_lrelease_target
-	java.CONFIG += no_lrelease_target
 }
 
 ios {
 	SUBDIRS += datasyncios
 
 	datasyncios.depends += datasync
 	imports.depends += datasyncios
-
-	datasyncios.CONFIG += no_lrelease_target
 }
 
-prepareRecursiveTarget(lrelease)
-QMAKE_EXTRA_TARGETS += lrelease run-tests
+QMAKE_EXTRA_TARGETS += run-tests

src/messages/qpmx.json

@@ -47,6 +47,7 @@ DISTFILES += $$SVC_CONFIG_FILES \
 	dockerbuild/*
 
 include(../../src/messages/messages.pri)
+QDEP_LINK_DEPENDS += ../../src/messages
 
 win32 {
 	QMAKE_TARGET_PRODUCT = "Qt Datasync Server"
@@ -57,13 +58,6 @@ win32 {
 	CONFIG -= c++1z #TODO remove later
 }
 
-#not found by linker?
-#unix:!mac {
-#	LIBS += -L$$[QT_INSTALL_LIBS] -licudata
-#	LIBS += -L$$[QT_INSTALL_LIBS] -licui18n
-#	LIBS += -L$$[QT_INSTALL_LIBS] -licuuc
-#}
-
 load(qt_app)
 
 # svc-files install
@@ -100,6 +94,4 @@ install_system_service {
 	INSTALLS += install_svcconf
 }
 
-!ReleaseBuild:!DebugBuild:!system(qpmx -d $$shell_quote($$_PRO_FILE_PWD_) --qmake-run init $$QPMX_EXTRA_OPTIONS $$shell_quote($$QMAKE_QMAKE) $$shell_quote($$OUT_PWD)): error(qpmx initialization failed. Check the compilation log for details.)
-else: include($$OUT_PWD/qpmx_generated.pri)
-
+!load(qdep):error("Failed to load qdep feature! Run 'qdep prfgen --qmake $$QMAKE_QMAKE' to create it.")

src/plugins/keystores/keystores.pro

@@ -2,5 +2,4 @@ TEMPLATE = subdirs
 
 !cross_compile: SUBDIRS += appserver
 
-prepareRecursiveTarget(lrelease)
-QMAKE_EXTRA_TARGETS += lrelease run-tests
+QMAKE_EXTRA_TARGETS += run-tests