QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-04-26 17:54:32 +00:00
Code Issues Projects Releases Wiki Activity

fix #287

Browse Source
This commit is contained in:
Andrei Yankovich 2020-02-25 15:18:14 +03:00
parent 5e4f028872
commit 7ca22b2b0e
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Deploy/deploycore.cpp
View File

@ -128,6 +128,10 @@ LibPriority DeployCore::getLibPriority(const QString &lib) {
return ExtraLib;
}
if (isAlienLib(lib)) {
return AlienLib;
}
return SystemLib;
}
@ -478,6 +482,11 @@ bool DeployCore::isExtraLib(const QString &lib) {
return _config->extraPaths.contains(info.absoluteFilePath());
}
bool DeployCore::isAlienLib(const QString &lib) {
return lib.contains("/opt/", ONLY_WIN_CASE_INSENSIATIVE) ||
lib.contains("/PROGRAM FILES", ONLY_WIN_CASE_INSENSIATIVE);
}
QChar DeployCore::getSeparator(int lvl) {
switch (lvl) {
case 0: return ',';

5
Deploy/deploycore.h
View File

@ -46,7 +46,8 @@ enum LibPriority : int {
QtLib = 0x0,
ExtraLib,
SystemLib,
ExtraFile,
AlienLib,
// ExtraFile,
NotFile = 0xF,
};
@ -150,6 +151,8 @@ public:
static bool isQtLib(const QString &lib);
static bool isExtraLib(const QString &lib);
static QChar getSeparator(int lvl);
static bool isAlienLib(const QString &lib);
static char getEnvSeparator();
static LibPriority getLibPriority(const QString &lib);

4
Deploy/extracter.cpp
View File

@ -329,11 +329,11 @@ void Extracter::extractLib(const QString &file,
continue;
}
if (line.getPriority() != LibPriority::SystemLib && !depMap->containsNeadedLib(line.fullPath())) {
if (line.getPriority() < LibPriority::SystemLib && !depMap->containsNeadedLib(line.fullPath())) {
depMap->addNeadedLib(line.fullPath());
} else if (QuasarAppUtils::Params::isEndable("deploySystem") &&
line.getPriority() == LibPriority::SystemLib &&
line.getPriority() >= LibPriority::SystemLib &&
!depMap->containsSysLib(line.fullPath())) {
depMap->addSystemLib(line.fullPath());