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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 14:24:06 +00:00
parent c732fbbefb
commit 16b64a636c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/deploy_tool/main.cpp
View File

@@ -110,7 +110,7 @@ QtDep qt_deps[] = {
int depth = 5; int depth = 5;
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; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers, input_files, plugin_libs;
PISet<PIString> all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs; PISet<PIString> all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs;
PIMap<PIString, PIStringList> qt_filters; PIMap<PIString, PIStringList> qt_filters;
@@ -346,8 +346,10 @@ void procQt() {
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) {
if (fi.isFile()) if (fi.isFile()) {
procLdd(fi.path); procLdd(fi.path);
plugin_libs << fi.path;
}
} }
} }
} }
@@ -378,6 +380,8 @@ void patchNameTool() {
PIStringList dlibs; PIStringList dlibs;
//PICout(DefaultControls) << "start patch" << clibs; //PICout(DefaultControls) << "start patch" << clibs;
PIFile::FileInfo fi; PIFile::FileInfo fi;
patch_list = input_files;
patch_list << plugin_libs;
piForeach (PIString l, clibs) { piForeach (PIString l, clibs) {
fi.path = l; fi.path = l;
patch_list << (out_dir + fi.name()); patch_list << (out_dir + fi.name());
@@ -415,7 +419,7 @@ void patchNameTool() {
if (!new_path.isEmpty() && (sys_lib != new_path)) { if (!new_path.isEmpty() && (sys_lib != new_path)) {
cmd = nametool + " -change \"" + sys_lib + "\""; cmd = nametool + " -change \"" + sys_lib + "\"";
cmd += " \"" + new_path + "\""; cmd += " \"" + new_path + "\"";
cmd += " \"" + local_lib + "\""; cmd += " \"" + local_lib + "\" 2> /dev/null";
//piCout << " " << cmd; //piCout << " " << cmd;
execute(cmd); execute(cmd);
} }
@@ -423,7 +427,7 @@ void patchNameTool() {
} }
piForeach (PIString bin, input_files) { piForeach (PIString bin, input_files) {
cmd = nametool + " -add_rpath \"@executable_path/../Frameworks\""; cmd = nametool + " -add_rpath \"@executable_path/../Frameworks\"";
cmd += " \"" + bin + "\""; cmd += " \"" + bin + "\" 2> /dev/null";
execute(cmd); execute(cmd);
} }
} }