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

deploy_tool windows libraries case patch

Browse Source
This commit is contained in:
Пелипенко Иван
2021-04-29 12:25:17 +03:00
parent a19c6f1292
commit 5dad08c729
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/deploy_tool/main.cpp
View File

@@ -130,7 +130,7 @@ 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, rpath = false; bool fake = false, is_ldd = true, is_deps = false, need_qt = false, make_qt_format = true, rpath = false, win_target = 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, target_dir; PIString qt_pref, qt_suff, qt_conf_dir, qt_plugins_dir, target_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;
@@ -141,8 +141,13 @@ PIMap<PIString, PIStringList> qt_filters;
PIString findLib(const PIString & l) { PIString findLib(const PIString & l) {
if (PIFile::isExists(l)) return l; if (PIFile::isExists(l)) return l;
piForeachC (PIString & s, lib_dirs) { piForeachC (PIString & s, lib_dirs) {
if (PIFile::isExists(s + l)) { if (PIFile::isExists(s + l))
return s + l; return s + l;
if (win_target) {
if (PIFile::isExists(s + l.toLowerCase()))
return s + l.toLowerCase();
if (PIFile::isExists(s + l.toUpperCase()))
return s + l.toUpperCase();
} }
} }
return ""; return "";
@@ -613,6 +618,7 @@ int main(int argc, char * argv[]) {
} }
if (!cli.argumentValue("Platforms").isEmpty()) if (!cli.argumentValue("Platforms").isEmpty())
qplatforms = cli.argumentValue("Platforms"); qplatforms = cli.argumentValue("Platforms");
if (platforms.contains("windows")) win_target = true;
platforms = qplatforms.split(","); platforms = qplatforms.split(",");
styles = cli.argumentValue("Styles").split(","); styles = cli.argumentValue("Styles").split(",");
if (styles.isEmpty()) styles << ""; if (styles.isEmpty()) styles << "";