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

deploy_tool/main.cpp

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-18 19:58:45 +03:00
parent 81d36618e3
commit b46ffff2de
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/deploy_tool/main.cpp
View File

@@ -66,7 +66,7 @@ void usage() {
piCout << Green << Bold << "Usage:" << Default << "\"deploy_tool [-hvfC] [--dependencies [--prefix <text>]] " piCout << Green << Bold << "Usage:" << Default << "\"deploy_tool [-hvfC] [--dependencies [--prefix <text>]] "
"[--qt-plugins-dir <d>] [-s <search_path>] [--ignore <libs>] [-S <styles>] " "[--qt-plugins-dir <d>] [-s <search_path>] [--ignore <libs>] [-S <styles>] "
"[-l <ldd>] [-D <dpkg>] [--dpkg-workdir <d>] [-L <readelf> | -W <objdump> | -M <otool>] " "[-l <ldd>] [-D <dpkg>] [--dpkg-workdir <d>] [-L <readelf> | -W <objdump> | -M <otool>] "
"[--name-tool <pathS>] [--rpath <rpath>] [-d <depth>] [-q <qtdir>] [-a <add_libs>] [-S <styles>] " "[--name-tool <pathS>] [--rpath] [-d <depth>] [-q <qtdir>] [-a <add_libs>] [-S <styles>] "
"[-P <platforms>] [--qt-plugins <d>] [--qt-modules <l>] [--qt-conf-dir <d>] -o <out_path> <file> [<file2> ...]\"" << NewLine; "[-P <platforms>] [--qt-plugins <d>] [--qt-modules <l>] [--qt-conf-dir <d>] -o <out_path> <file> [<file2> ...]\"" << NewLine;
piCout << Green << Bold << "Details:"; piCout << Green << Bold << "Details:";
piCout << Bold << "Debug control"; piCout << Bold << "Debug control";
@@ -85,7 +85,7 @@ void usage() {
piCout << "--dpkg-workdir <d> " << Green << "- dpkg \"admindir\" path, default \"\""; piCout << "--dpkg-workdir <d> " << Green << "- dpkg \"admindir\" path, default \"\"";
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 << "--strip <path> " << Green << "- \"strip\" path, default \"strip\""; piCout << "--strip <path> " << Green << "- \"strip\" path, default \"strip\"";
piCout << "--rpath <rpath> " << Green << "- set rpath for input files to \"rpath\" using \"patchelf\" if non-empty"; piCout << "--rpath " << Green << "- set rpath for input files using \"patchelf\"";
piCout << "-d <depth> " << Green << "- maximum dependepcies depth, default 8"; piCout << "-d <depth> " << Green << "- maximum dependepcies depth, default 8";
piCout << ""; piCout << "";
piCout << Bold << "Qt control"; piCout << Bold << "Qt control";
@@ -130,9 +130,9 @@ QtDep qt_deps[] = {
int depth = 8; int depth = 8;
bool fake = false, is_ldd = true, is_deps = false, need_qt = false, make_qt_format = true; bool fake = false, is_ldd = true, is_deps = false, need_qt = false, make_qt_format = true, rpath = false;
PIString ldd, readelf, objdump, otool, dpkg, nametool, strip, out_dir, qt_dir, dpkg_workdir; PIString ldd, readelf, objdump, otool, dpkg, nametool, strip, out_dir, qt_dir, dpkg_workdir;
PIString qt_pref, qt_suff, qt_conf_dir, qt_plugins_dir, rpath; PIString qt_pref, qt_suff, qt_conf_dir, qt_plugins_dir;
PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs, qt_add_libs; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs, qt_add_libs;
PISet<PIString> all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs, qt_libs; PISet<PIString> all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs, qt_libs;
PIMap<PIString, PIStringList> qt_filters; PIMap<PIString, PIStringList> qt_filters;
@@ -491,7 +491,10 @@ void patchNameTool() {
void patchRPath(const PIString & file) { void patchRPath(const PIString & file) {
PIString cmd = "patchelf --set-rpath \"" + rpath + "\" \"" + file + "\""; PIFile::FileInfo fi(file);
PIString rp = PIDir(fi.dir()).relative(out_dir);
if (rp.isEmpty()) rp = ".";
PIString cmd = "patchelf --set-rpath \"\\$ORIGIN/" + rp + "\" \"" + file + "\"";
piCout << "set rpath" << file << cmd; piCout << "set rpath" << file << cmd;
execute(cmd); execute(cmd);
} }
@@ -521,7 +524,7 @@ int main(int argc, char * argv[]) {
cli.addArgument("Wobjdump", true); cli.addArgument("Wobjdump", true);
cli.addArgument("Motool", true); cli.addArgument("Motool", true);
cli.addArgument("name-tool", PIChar('\0'), true); cli.addArgument("name-tool", PIChar('\0'), true);
cli.addArgument("rpath", PIChar('\0'), true); cli.addArgument("rpath", PIChar('\0'));
cli.addArgument("strip", PIChar('\0'), true); cli.addArgument("strip", PIChar('\0'), true);
cli.addArgument("Dpkg", true); cli.addArgument("Dpkg", true);
cli.addArgument("dpkg-workdir", PIChar('\0'), true); cli.addArgument("dpkg-workdir", PIChar('\0'), true);
@@ -548,7 +551,7 @@ int main(int argc, char * argv[]) {
otool = cli.argumentValue("Motool"); otool = cli.argumentValue("Motool");
nametool = cli.argumentValue("name-tool"); nametool = cli.argumentValue("name-tool");
strip = cli.argumentValue("strip"); strip = cli.argumentValue("strip");
rpath = cli.argumentValue("rpath"); rpath = cli.hasArgument("rpath");
if (nametool.isEmpty()) if (nametool.isEmpty())
nametool = "install_name_tool"; nametool = "install_name_tool";
if (strip.isEmpty()) if (strip.isEmpty())
@@ -653,7 +656,7 @@ int main(int argc, char * argv[]) {
} }
}); });
if (!rpath.isEmpty()) { if (rpath) {
input_files.forEach([&](const PIString & f){ input_files.forEach([&](const PIString & f){
patchRPath(f); patchRPath(f);
}); });
@@ -706,7 +709,7 @@ int main(int argc, char * argv[]) {
} }
} }
if (!rpath.isEmpty()) { if (rpath) {
plugin_libs.forEach([&](const PIString & f){ plugin_libs.forEach([&](const PIString & f){
patchRPath(f); patchRPath(f);
}); });