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

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-16 11:04:01 +00:00
parent 23498b25f0
commit aa738cf17a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/deploy_tool/main.cpp
View File

@@ -372,17 +372,20 @@ 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; if (!dlibs.isEmpty()) {
execute("chmod +w \"" + ll + "\"");
}
PICout(DefaultControls) << "patch" << ll;
piForeach (PIString dl, dlibs) { piForeach (PIString dl, dlibs) {
dl.cutRight(1).trim(); dl.cutRight(1).trim();
PIFile::FileInfo fi2; PIFile::FileInfo fi2;
fi2.path = dl; fi2.path = dl;
dl = findLib(fi2.name()); PIString fl = findLib(fi2.name());
PICout(DefaultControls) << " depend on" << dl << "..."; PICout(DefaultControls) << " depend on" << fl << "...";
if (!all_libs.contains(dl)) continue; if (!all_libs.contains(fl)) continue;
PICout(DefaultControls) << " yes"; PICout(DefaultControls) << " yes";
cmd = nametool + " -change \"" + l + "\""; cmd = nametool + " -change \"" + dl + "\"";
cmd += " \"@executable_path/../Frameworks/" + fi.name() + "\""; cmd += " \"@executable_path/../Frameworks/" + fi2.name() + "\"";
cmd += " \"" + ll + "\""; cmd += " \"" + ll + "\"";
PICout(DefaultControls) << cmd; PICout(DefaultControls) << cmd;
execute(cmd); execute(cmd);