diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 79c7145e..3909e67d 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -111,7 +111,7 @@ int depth = 5; 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; PIStringList styles, lib_dirs, add_libs, platforms, sqldrivers; -PISet all_libs, miss_libs, all_deps, frameworks, miss_frameworks, qt_plugins, ignore_libs; +PISet all_libs, miss_libs, all_deps, frameworks, framework_libs, miss_frameworks, qt_plugins, ignore_libs; PIMap qt_filters; @@ -138,6 +138,11 @@ PIString frameworkName(const PIString & l) { } +PIString frameworkInternalPath(const PIString & l) { + return l.right(l.size_s() - l.lastIndexOf(".framework") - 11); +} + + PIString execute(const PIString & cmd) { FILE * fp = popen(cmd.dataAscii(), "r"); PIString ret; @@ -232,6 +237,7 @@ void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) { PIString fname = frameworkName(l); if (!fname.isEmpty()) { frameworks << fname; + framework_libs << l; checkQtLib(fname.toLowerCase()); continue; } @@ -367,14 +373,21 @@ bool procDpkg(const PIString & l) { void patchNameTool() { if (nametool.isEmpty()) return; - PIVector clibs = all_libs.toVector(); - PIString local_lib, libname, cmd; + PIVector clibs = all_libs.toVector(), flibs = framework_libs.toVector(), patch_list; + PIString libname, cmd; PIStringList dlibs; //PICout(DefaultControls) << "start patch" << clibs; PIFile::FileInfo fi; piForeach (PIString l, clibs) { fi.path = l; - local_lib = out_dir + fi.name(); + patch_list << (out_dir + fi.name()); + } + piForeach (PIString f, flibs) { + PIString fl = findLib(frameworkName(f)); + if (fl.isEmpty()) continue; + patch_list << (out_dir + frameworkName(f) + "/" + frameworkInternalPath(f)); + } + piForeach (PIString local_lib, patch_list) { cmd = otool + " -L \"" + local_lib; cmd += "\" | grep -o \".*(\""; dlibs = execute(cmd).split("\n"); @@ -388,23 +401,22 @@ void patchNameTool() { libname = fi.name(); PIString fl = findLib(libname), fname = frameworkName(sys_lib); if (all_libs.contains(fl)) { - PICout(DefaultControls) << " " << "depend on lib" << fl; + PICout(DefaultControls) << " depend on lib" << fl; cmd = nametool + " -change \"" + sys_lib + "\""; cmd += " \"@executable_path/../Frameworks/" + libname + "\""; cmd += " \"" + local_lib + "\""; - PICout(DefaultControls) << " " << cmd; + //PICout(DefaultControls) << " " << cmd; execute(cmd); } if (frameworks.contains(fname)) { fl = findLib(fname); if (fl.isEmpty()) continue; - PIString fintpath = sys_lib.right(sys_lib.size_s() - sys_lib.lastIndexOf(".framework") - 11); - PICout(DefaultControls) << " " << "depend on framework" << fl; + PICout(DefaultControls) << " depend on framework" << fl; cmd = nametool + " -change \"" + sys_lib + "\""; - cmd += " \"@executable_path/../Frameworks/" + fname + "/" + fintpath + "\""; + cmd += " \"@executable_path/../Frameworks/" + fname + "/" + frameworkInternalPath(sys_lib) + "\""; cmd += " \"" + local_lib + "\""; - PICout(DefaultControls) << " " << cmd; - //execute(cmd); + //PICout(DefaultControls) << " " << cmd; + execute(cmd); } } }