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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 10:40:22 +00:00
parent 0c195dc4f1
commit 93ece68825
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/deploy_tool/main.cpp
View File

@@ -364,6 +364,7 @@ void patchNameTool() {
PIVector<PIString> clibs = all_libs.toVector(); PIVector<PIString> clibs = all_libs.toVector();
PIString ll, cmd; PIString ll, cmd;
PIStringList dlibs; PIStringList dlibs;
PICout(DefaultControls) << "start patch" << clibs;
piForeach (PIString l, clibs) { piForeach (PIString l, clibs) {
PIFile::FileInfo fi; PIFile::FileInfo fi;
fi.path = l; fi.path = l;
@@ -371,7 +372,7 @@ void patchNameTool() {
cmd = otool + " -L \"" + ll; cmd = otool + " -L \"" + ll;
cmd += "\" | grep -o \".*(\""; cmd += "\" | grep -o \".*(\"";
dlibs = execute(cmd).split("\n"); dlibs = execute(cmd).split("\n");
PICout(DefaultControls) << "patch" << ll << dlibs.size(); PICout(DefaultControls) << "patch" << ll << dlibs;
piForeach (PIString dl, dlibs) { piForeach (PIString dl, dlibs) {
dl.cutRight(1).trim(); dl.cutRight(1).trim();
if (!all_libs.contains(dl)) continue; if (!all_libs.contains(dl)) continue;