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

PIVector doc, forEach refactory

Browse Source
This commit is contained in:
Andrey
2022-04-14 15:58:40 +03:00
parent 77e0423375
commit fa93c8a486
5 changed files with 150 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/deploy_tool/main.cpp
View File

@@ -622,7 +622,7 @@ int main(int argc, char * argv[]) {
for (int i = 0; ; ++i) {
if (qt_deps[i].lib.isEmpty()) break;
qt_deps[i].plugins.forEach([&](const PIString & p){qt_filters[p] = PIStringList("*");});
qt_deps[i].plugins.forEach([](const PIString & p){qt_filters[p] = PIStringList("*");});
}
if (!cli.argumentValue("Platforms").isEmpty())
qplatforms = cli.argumentValue("Platforms");
@@ -635,15 +635,15 @@ int main(int argc, char * argv[]) {
int _i = qp.indexOf("=");
if (_i < 0) continue;
PIString pname = qp.left(_i).trim();
PIString pfilt = qp.mid(_i + 1).trim();
PIStringList pfilt = qp.mid(_i + 1).trim().split(",");
if (pname == "*") {
for (int i = 0; ; ++i) {
if (qt_deps[i].lib.isEmpty()) break;
qt_deps[i].plugins.forEach([&](const PIString & p){qt_filters[p] = pfilt.split(",");});
qt_deps[i].plugins.forEach([&pfilt](const PIString & p){qt_filters[p] = pfilt;});
}
} else {
qt_plugins << pname;
qt_filters[pname] = pfilt.split(",");
qt_filters[pname] = pfilt;
}
}
qt_filters["platforms"] = platforms;
@@ -674,11 +674,11 @@ int main(int argc, char * argv[]) {
if (!cli.argumentValue("depth").isEmpty())
depth = cli.argumentValue("depth").toInt();
cli.optionalArguments().forEach([&](const PIString & a){
cli.optionalArguments().forEach([](const PIString & a){
if (PIDir::isExists(a)) {
if (target_dir.isEmpty())
target_dir = a;
PIDir(a).allEntries().forEach([&](const PIFile::FileInfo & fi){
PIDir(a).allEntries().forEach([](const PIFile::FileInfo & fi){
if (fi.isFile())
input_files << fi.path;
});
@@ -692,8 +692,8 @@ int main(int argc, char * argv[]) {
//piCout << files;
if (depth > 0) {
input_files.forEach([&](const PIString & f){procLdd(f);});
qt_add_libs.forEach([&](const PIString & f){
input_files.forEach([](const PIString & f){procLdd(f);});
qt_add_libs.forEach([](const PIString & f){
PIString l = findLib(qt_pref + f + qt_suff);
if (l.isEmpty()) return;
procLdd(l, true);