SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@852 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-03-18 20:59:59 +00:00
parent 8ac2cce3f8
commit b9609cb341
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
deploy_tool/main.cpp
View File

@@ -33,7 +33,7 @@ void usage() {
piCout << "If <file> depend on QtCore library, then copy all basic Qt plugins, ";
piCout << "<styles> and <platform>";
piCout << "";
piCout << Green << Bold << "Usage:" << Default << "\"deploy_tool [-hvfC] [--dependencies] -o <out_path> [-p <qt_plugins>] [-s <search_path>] [-S <styles>] [-l <ldd>] [-D <dpkg>] [-L <readelf> | -W <objdump> | -M <otool>] [-d <depth>] [-q <qtdir>] [-a <add_libs>] [-S <styles>] [-P <platforms>] <file>\"" << NewLine;
piCout << Green << Bold << "Usage:" << Default << "\"deploy_tool [-hvfC] <-o <out_path> | --dependencies > [-p <qt_plugins>] [-s <search_path>] [-S <styles>] [-l <ldd>] [-D <dpkg>] [-L <readelf> | -W <objdump> | -M <otool>] [-d <depth>] [-q <qtdir>] [-a <add_libs>] [-S <styles>] [-P <platforms>] <file>\"" << NewLine;
piCout << Green << Bold << "Details:";
piCout << Bold << "Debug control";
piCout << "-h " << Green << "- display this message and exit";
@@ -205,7 +205,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
void copyWildcard(const PIString & from, const PIString & to) {
piCout << "copy" << from;
if (fake) return;
if (fake || is_deps) return;
PIDir(to).make();
#ifdef WINDOWS
PIFile::FileInfo fi; fi.path = from;
@@ -237,7 +237,7 @@ void procQt() {
PIStringList vsl = vs.split("\n");
PIStringList pdirs;
pdirs << "imageformats" << "sqldrivers";
if (!fake)
if (!fake && !is_deps)
PIDir(out_plugins_dir).make(true);
piForeach (PIString l, vsl) {
if (l.trim().contains("Qt version")) {
@@ -324,15 +324,15 @@ int main(int argc, char * argv[]) {
cli.addArgument("depth", true);
cli.addArgument("qtdir", true);
cli.addArgument("add_libs", true);
if (cli.hasArgument("help") || cli.argumentValue("output").isEmpty() || (cli.optionalArguments().size_s() != 1)) {
piDebug = cli.hasArgument("verbose");
fake = cli.hasArgument("fake");
is_deps = cli.hasArgument("dependencies");
if (cli.hasArgument("help") || (cli.argumentValue("output").isEmpty() && !is_deps) || (cli.optionalArguments().size_s() != 1)) {
usage();
return 0;
}
setCommands();
piDebug = cli.hasArgument("verbose");
fake = cli.hasArgument("fake");
is_deps = cli.hasArgument("dependencies");
PIString bin = cli.optionalArguments()[0];
out_dir = cli.argumentValue("output");
lib_dirs = cli.argumentValue("search_path").split(";");
@@ -370,7 +370,7 @@ int main(int argc, char * argv[]) {
if (!out_dir.endsWith("/")) out_dir += "/";
if (ldd.isEmpty()) ldd = "/usr/bin/ldd";
styles = cli.argumentValue("Styles").split(",");
if (!fake)
if (!fake && !is_deps)
PIDir(out_dir).make();
if (!cli.argumentValue("depth").isEmpty())
depth = cli.argumentValue("depth").toInt();