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@1057 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-18 13:59:21 +00:00
parent 39eb089a73
commit f5d6ad1854
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/deploy_tool/main.cpp
View File

@@ -64,7 +64,7 @@ void usage() {
piCout << "-M <otool> " << Green << "- \"otool\" path, overrides \"ldd\""; piCout << "-M <otool> " << Green << "- \"otool\" path, overrides \"ldd\"";
piCout << "-D <dpkg> " << Green << "- \"dpkg\" path, default \"/usr/bin/dpkg\""; piCout << "-D <dpkg> " << Green << "- \"dpkg\" path, default \"/usr/bin/dpkg\"";
piCout << "--name-tool <path> " << Green << "- \"install_name_tool\" path, default \"install_name_tool\""; piCout << "--name-tool <path> " << Green << "- \"install_name_tool\" path, default \"install_name_tool\"";
piCout << "-d <depth> " << Green << "- maximum dependepcies depth, default 5"; piCout << "-d <depth> " << Green << "- maximum dependepcies depth, default 8";
//piCout << "-Q, --Qt-force " << Green << "- force add Qt root dir, default takes from \"qmake -v\""; //piCout << "-Q, --Qt-force " << Green << "- force add Qt root dir, default takes from \"qmake -v\"";
piCout << ""; piCout << "";
piCout << Bold << "Qt control"; piCout << Bold << "Qt control";
@@ -107,7 +107,7 @@ QtDep qt_deps[] = {
}; };
int depth = 5; int depth = 8;
bool fake = false, is_ldd = true, is_deps = false, need_qt = false; bool fake = false, is_ldd = true, is_deps = false, need_qt = false;
PIString ldd, readelf, objdump, otool, dpkg, nametool, out_dir, qt_dir, out_plugins_dir; PIString ldd, readelf, objdump, otool, dpkg, nametool, out_dir, qt_dir, out_plugins_dir;
PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs;
@@ -419,7 +419,7 @@ void patchNameTool() {
PIString new_path; PIString new_path;
if (all_libs.contains(fl) || all_libs.contains(sys_lib)) { if (all_libs.contains(fl) || all_libs.contains(sys_lib)) {
new_path = "@executable_path/../Frameworks/" + libname; new_path = "@executable_path/../Frameworks/" + libname;
piCout << " depend on lib" << fl; piCout << " depend on lib" << (fl.isEmpty() ? sys_lib : fl);
} else { } else {
if (frameworks.contains(fname)) { if (frameworks.contains(fname)) {
fl = findLib(fname); fl = findLib(fname);
@@ -432,7 +432,7 @@ void patchNameTool() {
cmd = nametool + " -change \"" + sys_lib + "\""; cmd = nametool + " -change \"" + sys_lib + "\"";
cmd += " \"" + new_path + "\""; cmd += " \"" + new_path + "\"";
cmd += " \"" + local_lib + "\" 2> /dev/null"; cmd += " \"" + local_lib + "\" 2> /dev/null";
piCout << " *" << cmd; //piCout << " *" << cmd;
execute(cmd); execute(cmd);
} }
} }