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

git-svn-id: svn://db.shs.com.ru/pip@991 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-26 14:28:08 +00:00
parent fe9958184c
commit 63ac3161dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/deploy_tool/main.cpp
View File

@@ -36,8 +36,8 @@ void usage() {
piCout << "If some Qt dependency found, copy corresponding Qt plugins."; piCout << "If some Qt dependency found, copy corresponding Qt plugins.";
piCout << "Styles and platforms selected by -S and -P flags,"; piCout << "Styles and platforms selected by -S and -P flags,";
piCout << "any other plugins described by --qt-plugins flag in next format:"; piCout << "any other plugins described by --qt-plugins flag in next format:";
piCout << "\"[*=;]<plugins>=<regexp>,<regexp>;<plugins>=<regexp>,<regexp>\", e.g."; piCout << "\"[*=:]<plugins>=<regexp>,<regexp>:<plugins>=<regexp>,<regexp>\", e.g.";
piCout << "\"sqldrivers=lite,mysql;geoservices=;position=nmea\"."; piCout << "\"sqldrivers=lite,mysql:geoservices=:position=nmea\".";
piCout << "If no regexp specified for plugins, nothing will be copied."; piCout << "If no regexp specified for plugins, nothing will be copied.";
piCout << "Default regexp set by \"*=<regexp>\"."; piCout << "Default regexp set by \"*=<regexp>\".";
piCout << "\"*=\" disable optional plugins."; piCout << "\"*=\" disable optional plugins.";
@@ -312,6 +312,7 @@ void procQt() {
if (plugin == "styles") filters = styles; if (plugin == "styles") filters = styles;
if (plugin == "sqldrivers") filters = sqldrivers;*/ if (plugin == "sqldrivers") filters = sqldrivers;*/
piForeachC (PIString & f, filters) { piForeachC (PIString & f, filters) {
if (f.isEmpty()) continue;
copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin); copyWildcard(qdir + plugin + "/" + f, out_plugins_dir + plugin);
PIVector<PIFile::FileInfo> copied = PIDir(out_plugins_dir + plugin).entries(); PIVector<PIFile::FileInfo> copied = PIDir(out_plugins_dir + plugin).entries();
piForeachC (PIFile::FileInfo & fi, copied) { piForeachC (PIFile::FileInfo & fi, copied) {
@@ -416,7 +417,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(";"); PIStringList qpd = cli.argumentValue("qt-plugins").toLowerCase().split(":");
piForeachC (PIString & qp, qpd) { piForeachC (PIString & qp, qpd) {
int _i = qp.indexOf("="); int _i = qp.indexOf("=");
if (_i < 0) continue; if (_i < 0) continue;