QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-10 08:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request from QuasarApp/v1.3.2

Browse Source 
Version 1.3.2
This commit is contained in:
Andrei Yankovich 2019-11-16 21:05:31 +03:00 committed by GitHub
commit 82482707d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 4 deletions

2
Deploy/Deploy.pro

@ -19,7 +19,7 @@ TEMPLATE = lib
DEFINES += DEPLOY_LIBRARY
VERSION = 1.3.1.1
VERSION = 1.3.2.0
DEFINES += APP_VERSION='\\"$$VERSION\\"'

7
Deploy/metafilemanager.cpp

@ -113,7 +113,12 @@ bool MetaFileManager::createRunScript(const QString &target) {
return createRunScriptWindows(target);
}
return createRunScriptLinux(target);
if (sufix.isEmpty()) {
return createRunScriptLinux(target);
}
return true;
}
bool MetaFileManager::createQConf() {

10
UnitTests/modules.cpp

@ -301,6 +301,11 @@ QSet<QString> Modules::qmlLibs() {
"./" + DISTRO_DIR + "/qml/QtGraphicalEffects/qtgraphicaleffectsplugin.dll",
"./" + DISTRO_DIR + "/qml/QtQuick.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/qml/QtQuick.2/qmldir",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/Fusion/SplitView.qml",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/Imagine/SplitView.qml",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/Material/SplitView.qml",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/SplitView.qml",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/Universal/SplitView.qml",
"./" + DISTRO_DIR + "/qml/QtQuick.2/qtquick2plugin.dll",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/AbstractButton.qml",
"./" + DISTRO_DIR + "/qml/QtQuick/Controls.2/Action.qml",
@ -1470,6 +1475,11 @@ QSet<QString> Modules::outTestLibs() {
"./" + DISTRO_DIR + "/q/QtQuick.2/plugins.qmltypes",
"./" + DISTRO_DIR + "/q/QtQuick.2/qmldir",
"./" + DISTRO_DIR + "/q/QtQuick.2/qtquick2plugin.dll",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Fusion/SplitView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Imagine/SplitView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Material/SplitView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/SplitView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Universal/SplitView.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/AbstractButton.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/Action.qml",
"./" + DISTRO_DIR + "/q/QtQuick/Controls.2/ActionGroup.qml",

17
UnitTests/tst_deploytest.cpp

@ -858,6 +858,10 @@ void deploytest::testConfFile() {
QVERIFY(QFile::exists(TestBinDir + "/TestConf.json"));
QFile::remove(TestBinDir + "/TestConf.json");
comapareTree -= utils.createTree(
{"./" + DISTRO_DIR + "/bin/quicknanobrowser",
"./" + DISTRO_DIR + "/quicknanobrowser.sh"});
#ifdef Q_OS_UNIX
runTestParams({"-bin", TestBinDir + "TestOnlyC," + TestBinDir + "QtWidgetsProject," + TestBinDir + "TestQMLWidgets",
"clear",
@ -947,6 +951,7 @@ void deploytest::testConfFile() {
QVERIFY(data.contains("./../../../../../build/TestQMLWidgets"));
QVERIFY(data.contains("\"clear\": true"));
QString qmake = TestQtDir + "bin/qmake";
#else
@ -956,6 +961,7 @@ void deploytest::testConfFile() {
QVERIFY(data.contains("./../../../../../build/TestQMLWidgets.exe"));
QVERIFY(data.contains("\"clear\": true"));
QString qmake = TestQtDir + "bin/qmake.exe";
#endif
runTestParams({"-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, &comapareTree);
@ -963,6 +969,17 @@ void deploytest::testConfFile() {
QVERIFY(QuasarAppUtils::Params::isEndable("clear"));
QVERIFY(QuasarAppUtils::Params::isEndable("bin"));
comapareTree += Modules::qtLibs();
comapareTree += Modules::qmlLibs();
runTestParams({"-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json",
"-qmake", qmake,
"-qmlDir", TestBinDir + "/../TestQMLWidgets",
}, &comapareTree);
QVERIFY(QuasarAppUtils::Params::isEndable("clear"));
QVERIFY(QuasarAppUtils::Params::isEndable("bin"));
QFile::remove(TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json");
}

2
installer

@ -1 +1 @@
Subproject commit 7f33ec1794a96001d81a9ab9e9d966609987d50c
Subproject commit 235b7c2429e2957f0d1cdac6a25abec48b7a287a

2
snap/snapcraft.yaml

@ -6,7 +6,7 @@
#
name: cqtdeployer # you probably want to 'snapcraft register <name>'
version: '1.3.1.1' # just for humans, typically '1.2+git' or '1.3.2'
version: '1.3.2.0' # just for humans, typically '1.2+git' or '1.3.2'
summary: deploy your qt projects # 79 char long summary
description: |
Console app for deploy qt libs.