From c98bb03e1fe02c30347dc425fa43d056ed05d502 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Tue, 15 Oct 2019 13:35:50 +0300 Subject: [PATCH 1/6] fix #191 --- Deploy/extracter.cpp | 4 ++-- Deploy/filemanager.cpp | 13 +++++++++++++ Deploy/ignorerule.cpp | 6 +++--- Deploy/ignorerule.h | 8 +++++++- UnitTests/tst_deploytest.cpp | 20 ++++++++++++++++++++ 5 files changed, 45 insertions(+), 6 deletions(-) diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp index 5d30c91a..0caaae1f 100644 --- a/Deploy/extracter.cpp +++ b/Deploy/extracter.cpp @@ -103,7 +103,7 @@ void Extracter::copyExtraPlugins() { } void Extracter::copyPlugins(const QStringList &list) { - for (auto plugin : list) { + for (auto plugin : list) { if (!copyPlugin(plugin)) { qWarning() << plugin << " not copied!"; } @@ -292,7 +292,7 @@ bool Extracter::extractQmlAll() { if (!_fileManager->copyFolder(DeployCore::_config->qmlDir, DeployCore::_config->targetDir + DeployCore::_config->distroStruct.getQmlOutDir(), - QStringList() << ".so.debug" << "d.dll", + QStringList() << ".so.debug" << "d.dll" << ".pdb", &listItems)) { return false; } diff --git a/Deploy/filemanager.cpp b/Deploy/filemanager.cpp index 60638575..48c268ea 100644 --- a/Deploy/filemanager.cpp +++ b/Deploy/filemanager.cpp @@ -258,6 +258,19 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri QuasarAppUtils::VerboseLvl::Info); continue; } + auto config = DeployCore::_config; + + LibInfo info; + info.setName(item.fileName()); + info.setPath(item.absolutePath()); + + if (config) + if (auto rule = config->ignoreList.isIgnore(info)) { + QuasarAppUtils::Params::verboseLog( + item.absoluteFilePath() + " ignored by rule " + rule->label, + QuasarAppUtils::VerboseLvl::Info); + continue; + } if (!copyFile(item.absoluteFilePath(), to , mask)) { QuasarAppUtils::Params::verboseLog( diff --git a/Deploy/ignorerule.cpp b/Deploy/ignorerule.cpp index 980b84fc..b913adbc 100644 --- a/Deploy/ignorerule.cpp +++ b/Deploy/ignorerule.cpp @@ -35,7 +35,7 @@ bool IgnoreRule::check(const LibInfo &info, const QString& ignoreLabel) const { return false; } -bool IgnoreRule::isIgnore(const LibInfo &info) const { +const IgnoreData* IgnoreRule::isIgnore(const LibInfo &info) const { for (auto &ignore : _data) { @@ -44,12 +44,12 @@ bool IgnoreRule::isIgnore(const LibInfo &info) const { bool checkEnvirement = !ignore.enfirement.size() || ignore.enfirement.inThisEnvirement(info.fullPath()); if (checkPlatform && checkPriority && checkEnvirement && check(info, ignore.label)) { - return true; + return &ignore; } } - return false; + return nullptr; } IgnoreData::IgnoreData(const QString &label) { diff --git a/Deploy/ignorerule.h b/Deploy/ignorerule.h index c9138f96..caffd3b8 100644 --- a/Deploy/ignorerule.h +++ b/Deploy/ignorerule.h @@ -40,7 +40,13 @@ class IgnoreRule public: IgnoreRule(); void addRule(const IgnoreData& rule); - bool isIgnore(const LibInfo& info) const; + + /** + * @brief isIgnore + * @param info + * @return const ptr to ignore data + */ + const IgnoreData *isIgnore(const LibInfo& info) const; }; #endif // IGNORERULE_H diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 1e72e9c9..4c2d1a4e 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -1013,6 +1013,17 @@ void deploytest::testIgnore() { "./" + DISTRO_DIR + "/lib/libQt5VirtualKeyboard.so", }); + auto removeTreePlugins = utils.createTree({ + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so", + "./" + DISTRO_DIR + "/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so", + "./" + DISTRO_DIR + "/lib/libQt5VirtualKeyboard.so", + + }); + #else comapareTree = utils.createTree( { @@ -1023,6 +1034,9 @@ void deploytest::testIgnore() { auto removeTree = utils.createTree({ "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", }); + auto removeTreePlugins = utils.createTree({ + "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", + }); #endif @@ -1038,6 +1052,12 @@ void deploytest::testIgnore() { "-qmake", qmake, "-ignore", "VirtualKeyboard"}, &comapareTree); + comapareTree = Modules::qtLibs() - removeTreePlugins; + + runTestParams({"-bin", bin, "clear" , + "-qmake", qmake, + "-ignore", "VirtualKeyboard,virtualkeyboard"}, &comapareTree); + } void deploytest::testLibDir() { From 4fc34e7827db0a11cbb3173196c25ded527e8d07 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Wed, 16 Oct 2019 14:25:44 +0300 Subject: [PATCH 2/6] added tests of remote deployConf --- Deploy/configparser.cpp | 14 ++++++++--- UnitTests/tst_deploytest.cpp | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp index a17af119..efc6d468 100644 --- a/Deploy/configparser.cpp +++ b/Deploy/configparser.cpp @@ -65,8 +65,9 @@ bool ConfigParser::parseParams() { } - if (createFile) { - createFromDeploy(path); + if (createFile && !createFromDeploy(path)) { + QuasarAppUtils::Params::verboseLog("Do not create a deploy config file in " + path, + QuasarAppUtils::Error); } return true; @@ -161,8 +162,15 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj, bool ConfigParser::createFromDeploy(const QString& confFile) const { QJsonObject obj; + auto info = QFileInfo(confFile); + for (auto &key :DeployCore::helpKeys()) { - writeKey(key, obj, QFileInfo(confFile).absolutePath()); + writeKey(key, obj, info.absolutePath()); + } + + if (!QFile::exists(info.absolutePath()) && + !QDir("/").mkpath(info.absolutePath())) { + return false; } QJsonDocument doc(obj); diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 4c2d1a4e..3fae2d97 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -811,6 +811,7 @@ void deploytest::testConfFile() { TestUtils utils; QFile::remove(TestBinDir + "/TestConf.json"); + QFile::remove(TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"); #ifdef Q_OS_UNIX auto comapareTree = utils.createTree( @@ -891,6 +892,53 @@ void deploytest::testConfFile() { QVERIFY(QuasarAppUtils::Params::isEndable("bin")); QFile::remove(TestBinDir + "/TestConf.json"); + + +#ifdef Q_OS_UNIX + runTestParams({"-bin", TestBinDir + "TestOnlyC," + TestBinDir + "QtWidgetsProject," + TestBinDir + "TestQMLWidgets", + "clear" , + "-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, &comapareTree); +#else + runTestParams({"-bin", TestBinDir + "TestOnlyC.exe," + TestBinDir + "QtWidgetsProject.exe," + TestBinDir + "TestQMLWidgets.exe", + "clear" , + "-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, &comapareTree); +#endif + + confFile.setFileName(TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"); + QVERIFY(confFile.open(QIODevice::ReadOnly)); + + data = confFile.readAll(); + confFile.close(); + + doc = doc.fromJson(data); + QVERIFY(!doc.isNull()); + +#ifdef Q_OS_UNIX + + QVERIFY(data.contains("\"bin\": [")); + QVERIFY(data.contains("./../../../../../build/TestOnlyC")); + QVERIFY(data.contains("./../../../../../build/QtWidgetsProject")); + QVERIFY(data.contains("./../../../../../build/TestQMLWidgets")); + + QVERIFY(data.contains("\"clear\": true")); + +#else + + QVERIFY(data.contains("\"bin\": [")); + QVERIFY(data.contains("./../../../../../build/TestOnlyC.exe")); + QVERIFY(data.contains("./../../../../../build/QtWidgetsProject.exe")); + QVERIFY(data.contains("./../../../../../build/TestQMLWidgets.exe")); + + QVERIFY(data.contains("\"clear\": true")); + +#endif + runTestParams({"-confFile", TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"}, &comapareTree); + + QVERIFY(QuasarAppUtils::Params::isEndable("clear")); + QVERIFY(QuasarAppUtils::Params::isEndable("bin")); + + QFile::remove(TestBinDir + "/../folder/For/Testing/Deploy/File/TestConf.json"); + } void deploytest::testQt() { From 9e5bb1507aa73b0fc5420c679905f600cf91d2c6 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Wed, 16 Oct 2019 18:07:36 +0300 Subject: [PATCH 3/6] added new tests for absalute pathes --- Deploy/configparser.cpp | 18 +++++++++++--- Deploy/pathutils.cpp | 37 +++++++++++++++++++++------- Deploy/pathutils.h | 47 +++++++++++++++++++++++++++++++++++- UnitTests/tst_deploytest.cpp | 32 +++++++++++++++++++++--- 4 files changed, 118 insertions(+), 16 deletions(-) diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp index efc6d468..9e7e8f0c 100644 --- a/Deploy/configparser.cpp +++ b/Deploy/configparser.cpp @@ -130,8 +130,15 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj, if (!val.isEmpty()) { if (PathUtils::isPath(val)) { - list.push_back( - QFileInfo(confFileDir + '/' + val).absoluteFilePath()); + QString path; + + if (PathUtils::isAbsalutPath(val)) { + path = QFileInfo(val).absoluteFilePath(); + } else { + path = QFileInfo(confFileDir + '/' + val).absoluteFilePath(); + } + + list.push_back(path); } else { list.push_back(val); @@ -146,7 +153,12 @@ void ConfigParser::readKey(const QString& key, const QJsonObject& obj, if (!val.isEmpty()) { if (PathUtils::isPath(val)) { - val = QFileInfo(confFileDir + '/' + val).absoluteFilePath(); + + if (PathUtils::isAbsalutPath(val)) { + val = QFileInfo(val).absoluteFilePath(); + } else { + val = QFileInfo(confFileDir + '/' + val).absoluteFilePath(); + } } QuasarAppUtils::Params::setArg(key, val); diff --git a/Deploy/pathutils.cpp b/Deploy/pathutils.cpp index 51df1121..ab004726 100644 --- a/Deploy/pathutils.cpp +++ b/Deploy/pathutils.cpp @@ -35,6 +35,12 @@ QString PathUtils::toFullPath(QString path) { QString PathUtils::getRelativeLink(QString from, QString to) { + auto mainDrive = getDrive(from); + + if (mainDrive != getDrive(to) && !mainDrive.isNull()) { + return to; + } + bool isFile = QFileInfo(to).isFile(); from = toFullPath(from); to = toFullPath(to); @@ -63,6 +69,25 @@ bool PathUtils::isPath(const QString &path) { return path.contains('/') || path.contains('\\') || path == "."; } +QChar PathUtils::getDrive(QString path) { + + path = stripPath(path); + + if (path.size() > 1 && path[1] == ':') { + return path[0]; + } + + return 0; +} + +bool PathUtils::isAbsalutPath(const QString &path) { + if (getDrive(path).isNull()) { + return path.size() && (path.at(0) == "/" || path.at(0) == "\\"); + } + + return true; +} + QString PathUtils::getReleativePath(QString path) { path = toFullPath(path); @@ -81,19 +106,13 @@ QString PathUtils::getReleativePath(QString path) { } QString PathUtils::stripPath(QString path) { - path.replace('\\', '/'); - - int index = -1; - do { - path.replace("//", "/"); - } while ((index = path.indexOf("//")) >= 0); - + path = toFullPath(path); if (path.left(1) == '/') { - path = path.right(path.size() - 1); + path.remove(0, 1); } if (path.right(1) == '/') { - path = path.left(path.size() - 1); + return path.remove(path.size() - 1, 1); } return path; diff --git a/Deploy/pathutils.h b/Deploy/pathutils.h index 536436d1..9abe4171 100644 --- a/Deploy/pathutils.h +++ b/Deploy/pathutils.h @@ -19,11 +19,56 @@ class DEPLOYSHARED_EXPORT PathUtils { public: PathUtils(); + /** + * @brief toFullPath remove all dublicate separators and insert separators into begin and end + * @param path + * @return return full path + */ static QString toFullPath(QString path); + + /** + * @brief getReleativePath + * @param path + * @return return releative path from "path" to root dir + */ static QString getReleativePath(QString path); - static QString stripPath(QString path) ; + + /** + * @brief stripPath remove all dublicate separators and remove separators from begin and end + * @param path + * @return return strip patth + */ + static QString stripPath(QString path); + + /** + * @brief getRelativeLink return releative path + * @param from + * @param to + * @return releative path + */ static QString getRelativeLink(QString from, QString to); + + /** + * @brief isPath + * @param path + * @return return true if imput value is path + */ static bool isPath(const QString &path); + + /** + * @brief getDrive + * @param path + * @return char of drive in windows systems + */ + static QChar getDrive(QString path); + + /** + * @brief isAbsalutPath + * @param path + * @return return true if path is absolute + */ + static bool isAbsalutPath(const QString &path); + }; #endif // PATHUTILS_H diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index 3fae2d97..a37d20aa 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -581,11 +581,26 @@ void deploytest::testRelativeLink() { {"/media/etc/usr", "/media/etc", "./../"}, {"/media/etc", "/media/etc/usr", "./usr/"}, + {"C:/", "C:/", "./"}, + {"C:\\", "C:/", "./"}, + {"C:/", "C:\\", "./"}, + + {"C:/media", "C:/etc", "./../etc/"}, + {"C:/media//\\", "C:/etc///", "./../etc/"}, + {"C:/media/etc/usr", "C:/media/etc", "./../"}, + {"C:/media\\etc", "C:/media/etc/usr", "./usr/"}, + {"C:/media/etc", "D:/media/etc/usr", "D:/media/etc/usr"}, + }; for (auto &i: cases) { QVERIFY(PathUtils::getRelativeLink(i[0], i[1]) == i[2]); } + + for (int i = 1; i < cases.size() - 1; i++) { + QVERIFY(PathUtils::isAbsalutPath(cases[i][0])); + QVERIFY(!PathUtils::isAbsalutPath(cases[i][2])); + } } void deploytest::testSetTargetDir() { @@ -845,11 +860,11 @@ void deploytest::testConfFile() { #ifdef Q_OS_UNIX runTestParams({"-bin", TestBinDir + "TestOnlyC," + TestBinDir + "QtWidgetsProject," + TestBinDir + "TestQMLWidgets", - "clear" , + "clear", "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #else runTestParams({"-bin", TestBinDir + "TestOnlyC.exe," + TestBinDir + "QtWidgetsProject.exe," + TestBinDir + "TestQMLWidgets.exe", - "clear" , + "clear" , "-libDir", "L:/never/absalut/path" "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #endif @@ -870,9 +885,14 @@ void deploytest::testConfFile() { QVERIFY(data.contains("./TestOnlyC")); QVERIFY(data.contains("./QtWidgetsProject")); QVERIFY(data.contains("./TestQMLWidgets")); +// QVERIFY(data.contains("\"libDir\": \"/never/absalut/path/\"")); QVERIFY(data.contains("\"clear\": true")); + QVERIFY(confFile.open(QIODevice::ReadOnly | QIODevice::Append)); + confFile.write(QString("\"libDir\": \"/never/absalut/path/\"").toLatin1()); + confFile.close(); + runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #else QVERIFY(!doc.isNull()); @@ -881,6 +901,7 @@ void deploytest::testConfFile() { QVERIFY(data.contains("./TestOnlyC.exe")); QVERIFY(data.contains("./QtWidgetsProject.exe")); QVERIFY(data.contains("./TestQMLWidgets.exe")); + QVERIFY(data.contains("\"libDir\": \"L:/never/absalut/path/\"")); QVERIFY(data.contains("\"clear\": true")); @@ -890,7 +911,12 @@ void deploytest::testConfFile() { QVERIFY(QuasarAppUtils::Params::isEndable("clear")); QVERIFY(QuasarAppUtils::Params::isEndable("bin")); - + QVERIFY(QuasarAppUtils::Params::isEndable("libDir")); +#ifdef Q_OS_UNIX + QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "/never/absalut/path/"); +#else + QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path/"); +#endif QFile::remove(TestBinDir + "/TestConf.json"); From b763709b04a0b1873f3453befd0b51b4b58f9f94 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Thu, 17 Oct 2019 12:42:55 +0300 Subject: [PATCH 4/6] fixed create deploy.json --- Deploy/configparser.cpp | 2 +- UnitTests/tst_deploytest.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Deploy/configparser.cpp b/Deploy/configparser.cpp index 9e7e8f0c..34e88cf3 100644 --- a/Deploy/configparser.cpp +++ b/Deploy/configparser.cpp @@ -18,7 +18,7 @@ bool ConfigParser::parseParams() { auto path = QuasarAppUtils::Params::getStrArg("confFile"); - bool createFile = !path.isEmpty(); + bool createFile = !(path.isEmpty() || QFile::exists(path)); if (path.isEmpty()) { path = QFileInfo("./").absoluteFilePath(); } diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index a37d20aa..f2c8e93a 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -889,8 +889,10 @@ void deploytest::testConfFile() { QVERIFY(data.contains("\"clear\": true")); - QVERIFY(confFile.open(QIODevice::ReadOnly | QIODevice::Append)); - confFile.write(QString("\"libDir\": \"/never/absalut/path/\"").toLatin1()); + data.insert(data.size() - 2, QString(",\"libDir\": \"/never/absalut/path/\"").toLatin1()); + + QVERIFY(confFile.open(QIODevice::WriteOnly | QIODevice::Truncate)); + confFile.write(data); confFile.close(); runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); From 69d311b76747c66038de5bd10d67852c11ecd749 Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Thu, 17 Oct 2019 15:42:44 +0300 Subject: [PATCH 5/6] fixed windwos bugs --- Deploy/deploycore.h | 4 +++- Deploy/filemanager.cpp | 1 + UnitTests/modules.cpp | 2 -- UnitTests/tst_deploytest.cpp | 18 ++++++++++++------ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Deploy/deploycore.h b/Deploy/deploycore.h index f97a071c..bad2983e 100644 --- a/Deploy/deploycore.h +++ b/Deploy/deploycore.h @@ -36,13 +36,15 @@ enum Platform { Win32 = 0x1, Win64 = 0x2, Unix32 = 0x4, - Unix64 = 0x8 + Unix64 = 0x8, + GeneralFile = 0xf }; enum LibPriority : int { QtLib = 0x0, ExtraLib, SystemLib, + ExtraFile, NotFile = 0xF, }; diff --git a/Deploy/filemanager.cpp b/Deploy/filemanager.cpp index 48c268ea..82dc7166 100644 --- a/Deploy/filemanager.cpp +++ b/Deploy/filemanager.cpp @@ -263,6 +263,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri LibInfo info; info.setName(item.fileName()); info.setPath(item.absolutePath()); + info.setPlatform(GeneralFile); if (config) if (auto rule = config->ignoreList.isIgnore(info)) { diff --git a/UnitTests/modules.cpp b/UnitTests/modules.cpp index 23013d6c..eaf45643 100644 --- a/UnitTests/modules.cpp +++ b/UnitTests/modules.cpp @@ -228,8 +228,6 @@ QSet Modules::qmlLibs() { "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", "./" + DISTRO_DIR + "/Qt5WebSockets.dll", "./" + DISTRO_DIR + "/Qt5Widgets.dll", - "./" + DISTRO_DIR + "/QtWidgetsProject.exe", - "./" + DISTRO_DIR + "/TestOnlyC.exe", "./" + DISTRO_DIR + "/TestQMLWidgets.exe", "./" + DISTRO_DIR + "/libgcc_s_seh-1.dll", "./" + DISTRO_DIR + "/libstdc++-6.dll", diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index f2c8e93a..92c5442f 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -864,7 +864,7 @@ void deploytest::testConfFile() { "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #else runTestParams({"-bin", TestBinDir + "TestOnlyC.exe," + TestBinDir + "QtWidgetsProject.exe," + TestBinDir + "TestQMLWidgets.exe", - "clear" , "-libDir", "L:/never/absalut/path" + "clear" , "-libDir", "L:/never/absalut/path", "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #endif @@ -879,7 +879,6 @@ void deploytest::testConfFile() { QVERIFY(!doc.isNull()); #ifdef Q_OS_UNIX - QVERIFY(!doc.isNull()); QVERIFY(data.contains("\"bin\": [")); QVERIFY(data.contains("./TestOnlyC")); @@ -897,13 +896,12 @@ void deploytest::testConfFile() { runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); #else - QVERIFY(!doc.isNull()); QVERIFY(data.contains("\"bin\": [")); QVERIFY(data.contains("./TestOnlyC.exe")); QVERIFY(data.contains("./QtWidgetsProject.exe")); QVERIFY(data.contains("./TestQMLWidgets.exe")); - QVERIFY(data.contains("\"libDir\": \"L:/never/absalut/path/\"")); + QVERIFY(data.contains("\"libDir\": \"L:/never/absalut/path\"")); QVERIFY(data.contains("\"clear\": true")); @@ -917,7 +915,7 @@ void deploytest::testConfFile() { #ifdef Q_OS_UNIX QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "/never/absalut/path/"); #else - QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path/"); + QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path"); #endif QFile::remove(TestBinDir + "/TestConf.json"); @@ -1110,8 +1108,16 @@ void deploytest::testIgnore() { auto removeTree = utils.createTree({ "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", }); + auto removeTreePlugins = utils.createTree({ - "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_hangul.dll", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_openwnn.dll", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_pinyin.dll", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_tcime.dll", + "./" + DISTRO_DIR + "/plugins/virtualkeyboard/qtvirtualkeyboard_thai.dll", + "./" + DISTRO_DIR + "/plugins/platforminputcontexts/qtvirtualkeyboardplugin.dll", + "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", + }); #endif From f2d43df6c7eb8c582358545016164f69b14abf9a Mon Sep 17 00:00:00 2001 From: "a.yankovich" Date: Thu, 17 Oct 2019 16:02:41 +0300 Subject: [PATCH 6/6] release v1.3.1 --- Deploy/Deploy.pro | 2 +- installer | 2 +- snap/snapcraft.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Deploy/Deploy.pro b/Deploy/Deploy.pro index b17e9762..a7cb1322 100644 --- a/Deploy/Deploy.pro +++ b/Deploy/Deploy.pro @@ -19,7 +19,7 @@ TEMPLATE = lib DEFINES += DEPLOY_LIBRARY -VERSION = 1.3.0.8 +VERSION = 1.3.1.0 DEFINES += APP_VERSION='\\"$$VERSION\\"' diff --git a/installer b/installer index d6a05484..4152bd2d 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit d6a05484158fdd2f388ac514d28395d89fecf8d3 +Subproject commit 4152bd2dee12c0c2092b651b3989f3cf67bd8cb5 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 04ec56d2..7dff448a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -6,7 +6,7 @@ # name: cqtdeployer # you probably want to 'snapcraft register ' -version: '1.3.0.8' # just for humans, typically '1.2+git' or '1.3.2' +version: '1.3.1.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.