SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

deploy_tool remove empty

Browse Source
This commit is contained in:
Пелипенко Иван
2023-11-20 23:33:34 +03:00
parent 76c76b48c5
commit 49a5ed6aa3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/deploy_tool/main.cpp
View File

@@ -612,9 +612,9 @@ int main(int argc, char * argv[]) {
piDebug = cli.hasArgument("verbose"); piDebug = cli.hasArgument("verbose");
is_deps = cli.hasArgument("dependencies"); is_deps = cli.hasArgument("dependencies");
out_dir = cli.argumentValue("output"); out_dir = cli.argumentValue("output");
lib_dirs = cli.argumentValue("search_path").split(DELIM); lib_dirs = cli.argumentValue("search_path").split(DELIM).removeAll("");
add_libs = cli.argumentValue("add_libs").split(DELIM); add_libs = cli.argumentValue("add_libs").split(DELIM).removeAll("");
ignore_libs = PISet<PIString>(cli.argumentValue("ignore").split(DELIM)); ignore_libs = PISet<PIString>(cli.argumentValue("ignore").split(DELIM).removeAll(""));
qt_dir = cli.argumentValue("qtdir"); qt_dir = cli.argumentValue("qtdir");
ldd = cli.argumentValue("ldd"); ldd = cli.argumentValue("ldd");
readelf = cli.argumentValue("Lreadelf"); readelf = cli.argumentValue("Lreadelf");
@@ -668,7 +668,7 @@ int main(int argc, char * argv[]) {
platforms = qplatforms.split(","); platforms = qplatforms.split(",");
styles = cli.argumentValue("Styles").split(","); styles = cli.argumentValue("Styles").split(",");
if (styles.isEmpty()) styles << ""; if (styles.isEmpty()) styles << "";
PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(DELIM); PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(DELIM).removeAll("");
piForeachC(PIString & qp, qpd) { piForeachC(PIString & qp, qpd) {
int _i = qp.find('='); int _i = qp.find('=');
if (_i < 0) continue; if (_i < 0) continue;
@@ -687,7 +687,7 @@ int main(int argc, char * argv[]) {
qt_filters["platforms"] = platforms; qt_filters["platforms"] = platforms;
qt_filters["styles"] = styles; qt_filters["styles"] = styles;
qt_add_libs = cli.argumentValue("qt-modules").split(DELIM); qt_add_libs = cli.argumentValue("qt-modules").split(DELIM).removeAll("");
auto getQtSubdir = [&cli](const char * arg, PIString & var) { auto getQtSubdir = [&cli](const char * arg, PIString & var) {
var = cli.argumentValue(arg).trim(); var = cli.argumentValue(arg).trim();
if (var.isEmpty()) if (var.isEmpty())
@@ -702,7 +702,7 @@ int main(int argc, char * argv[]) {
getQtSubdir("qt-plugins-dir", qt_plugins_dir); getQtSubdir("qt-plugins-dir", qt_plugins_dir);
getQtSubdir("qt-qml-dir", qt_qml_dir); getQtSubdir("qt-qml-dir", qt_qml_dir);
qml_list = cli.argumentValue("qml-modules").split(DELIM); qml_list = cli.argumentValue("qml-modules").split(DELIM).removeAll("");
need_qt = !qt_add_libs.isEmpty(); need_qt = !qt_add_libs.isEmpty();