Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add ability to exclude libs from a user specified list of folders. #292

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add ability to exclude libs from a user specified list of folders. #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tools/linuxdeployqt/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ int main(int argc, char **argv)
qInfo() << " -bundle-non-qt-libs : Also bundle non-core, non-Qt libraries.";
qInfo() << " -exclude-libs=<list> : List of libraries which should be excluded,";
qInfo() << " separated by comma.";
qInfo() << " -exclude-folders=<list> : Excludes all libs in any folder (or subfolder)";
qInfo() << " in the comma separated list.";
qInfo() << " -executable=<path> : Let the given executable use the deployed libraries";
qInfo() << " too";
qInfo() << " -extra-plugins=<list> : List of extra plugins which should be deployed,";
Expand Down Expand Up @@ -216,6 +218,7 @@ int main(int argc, char **argv)
QString qmakeExecutable;
extern QStringList extraQtPlugins;
extern QStringList excludeLibs;
extern QStringList blockedFolders;
extern bool copyCopyrightFiles;

/* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
Expand Down Expand Up @@ -431,6 +434,10 @@ int main(int argc, char **argv)
LogDebug() << "Argument found:" << argument;
int index = argument.indexOf("=");
excludeLibs = QString(argument.mid(index + 1)).split(",");
} else if (argument.startsWith("-exclude-folders=")) {
LogDebug() << "Argument found:" << argument;
int index = argument.indexOf("=");
blockedFolders = QString(argument.mid(index + 1)).split(",");
} else if (argument.startsWith("--")) {
LogError() << "Error: arguments must not start with --, only -:" << argument << "\n";
return 1;
Expand Down
6 changes: 6 additions & 0 deletions tools/linuxdeployqt/shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may enco
bool deployLibrary = false;
QStringList extraQtPlugins;
QStringList excludeLibs;
QStringList blockedFolders;
bool copyCopyrightFiles = true;

using std::cout;
Expand Down Expand Up @@ -464,6 +465,11 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
if ((trimmed.startsWith("/usr") or (trimmed.startsWith("/lib")))) {
return info;
}
for (int i = 0; i < blockedFolders.size(); ++i) {
if (trimmed.startsWith(blockedFolders.at(i))) {
return info;
}
}
}
}

Expand Down
1 change: 1 addition & 0 deletions tools/linuxdeployqt/shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ extern bool fhsLikeMode;
extern QString fhsPrefix;
extern QStringList extraQtPlugins;
extern QStringList excludeLibs;
extern QStringList blockedFolders;

class LibraryInfo
{
Expand Down