QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-16 19:39:36 +00:00
Code Issues Projects Releases Wiki Activity

fixed windwos bugs

Browse Source
This commit is contained in:
a.yankovich 2019-10-17 15:42:44 +03:00
parent b763709b04
commit 69d311b767
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/deploycore.h
View File

@ -36,13 +36,15 @@ enum Platform {
Win32 = 0x1, Win32 = 0x1,
Win64 = 0x2, Win64 = 0x2,
Unix32 = 0x4, Unix32 = 0x4,
Unix64 = 0x8 Unix64 = 0x8,
GeneralFile = 0xf
}; };
enum LibPriority : int { enum LibPriority : int {
QtLib = 0x0, QtLib = 0x0,
ExtraLib, ExtraLib,
SystemLib, SystemLib,
ExtraFile,
NotFile = 0xF, NotFile = 0xF,
}; };

1
Deploy/filemanager.cpp
View File

@ -263,6 +263,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
LibInfo info; LibInfo info;
info.setName(item.fileName()); info.setName(item.fileName());
info.setPath(item.absolutePath()); info.setPath(item.absolutePath());
info.setPlatform(GeneralFile);
if (config) if (config)
if (auto rule = config->ignoreList.isIgnore(info)) { if (auto rule = config->ignoreList.isIgnore(info)) {

2
UnitTests/modules.cpp
View File

@ -228,8 +228,6 @@ QSet<QString> Modules::qmlLibs() {
"./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
"./" + DISTRO_DIR + "/Qt5WebSockets.dll", "./" + DISTRO_DIR + "/Qt5WebSockets.dll",
"./" + DISTRO_DIR + "/Qt5Widgets.dll", "./" + DISTRO_DIR + "/Qt5Widgets.dll",
"./" + DISTRO_DIR + "/QtWidgetsProject.exe",
"./" + DISTRO_DIR + "/TestOnlyC.exe",
"./" + DISTRO_DIR + "/TestQMLWidgets.exe", "./" + DISTRO_DIR + "/TestQMLWidgets.exe",
"./" + DISTRO_DIR + "/libgcc_s_seh-1.dll", "./" + DISTRO_DIR + "/libgcc_s_seh-1.dll",
"./" + DISTRO_DIR + "/libstdc++-6.dll", "./" + DISTRO_DIR + "/libstdc++-6.dll",

16
UnitTests/tst_deploytest.cpp
View File

@ -864,7 +864,7 @@ void deploytest::testConfFile() {
"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
#else #else
runTestParams({"-bin", TestBinDir + "TestOnlyC.exe," + TestBinDir + "QtWidgetsProject.exe," + TestBinDir + "TestQMLWidgets.exe", 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); "-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
#endif #endif
@ -879,7 +879,6 @@ void deploytest::testConfFile() {
QVERIFY(!doc.isNull()); QVERIFY(!doc.isNull());
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QVERIFY(!doc.isNull());
QVERIFY(data.contains("\"bin\": [")); QVERIFY(data.contains("\"bin\": ["));
QVERIFY(data.contains("./TestOnlyC")); QVERIFY(data.contains("./TestOnlyC"));
@ -897,13 +896,12 @@ void deploytest::testConfFile() {
runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree); runTestParams({"-confFile", TestBinDir + "/TestConf.json"}, &comapareTree);
#else #else
QVERIFY(!doc.isNull());
QVERIFY(data.contains("\"bin\": [")); QVERIFY(data.contains("\"bin\": ["));
QVERIFY(data.contains("./TestOnlyC.exe")); QVERIFY(data.contains("./TestOnlyC.exe"));
QVERIFY(data.contains("./QtWidgetsProject.exe")); QVERIFY(data.contains("./QtWidgetsProject.exe"));
QVERIFY(data.contains("./TestQMLWidgets.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")); QVERIFY(data.contains("\"clear\": true"));
@ -917,7 +915,7 @@ void deploytest::testConfFile() {
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "/never/absalut/path/"); QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "/never/absalut/path/");
#else #else
QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path/"); QVERIFY(QuasarAppUtils::Params::getStrArg("libDir") == "L:/never/absalut/path");
#endif #endif
QFile::remove(TestBinDir + "/TestConf.json"); QFile::remove(TestBinDir + "/TestConf.json");
@ -1110,8 +1108,16 @@ void deploytest::testIgnore() {
auto removeTree = utils.createTree({ auto removeTree = utils.createTree({
"./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll", "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
}); });
auto removeTreePlugins = utils.createTree({ auto removeTreePlugins = utils.createTree({
"./" + 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", "./" + DISTRO_DIR + "/Qt5VirtualKeyboard.dll",
}); });
#endif #endif