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

pichar and pistring explicit test

Browse Source
This commit is contained in:
Бычков Андрей
2023-07-06 18:37:42 +03:00
parent 3a6b3a4064
commit 8ad2503c5a
6 changed files with 44 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/deploy_tool/main.cpp
View File

@@ -20,7 +20,6 @@
#include "picli.h"
#include "pidir.h"
#include "piiostream.h"
#include "piprocess.h"
#define DELIM "::"
@@ -251,7 +250,7 @@ void checkQtLib(PIString lib) {
for (int i = 0;; ++i) {
if (qt_deps[i].lib.isEmpty()) break;
if (qt_deps[i].lib == base) {
qt_plugins << qt_deps[i].plugins;
qt_plugins << PISet<PIString>(qt_deps[i].plugins);
// piCout << "add qt plugins" << qt_deps[i].plugins << "now" << qt_plugins;
need_qt = true;
qt_libs << lib;
@@ -269,8 +268,8 @@ void checkQtLib(PIString lib) {
void procLdd(PIString file, bool ext_lib = false, int cur_depth = 0) {
++cur_depth;
if (cur_depth > depth) return;
static PIStringList ignore_ext = {"png", "jpg", "jpeg", "gif", "bmp", "svg", "tif", "tiff", "ico", "pdf",
"txt", "cfg", "conf", "json", "qml", "glsl", "fraq", "vert", "geom", "qmltypes",
static PIStringList ignore_ext = {"png", "jpg", "jpeg", "gif", "bmp", "svg", "tif", "tiff", "ico", "pdf",
"txt", "cfg", "conf", "json", "qml", "glsl", "fraq", "vert", "geom", "qmltypes",
"metainfo", "ts", "qm", "ttf", "htm", "html", "md", "sms", "smsee", "blockmodel"};
PIString ext = PIFile::FileInfo(file).extension();
if (ignore_ext.contains(ext.toLowerCase())) return;
@@ -615,7 +614,7 @@ int main(int argc, char * argv[]) {
out_dir = cli.argumentValue("output");
lib_dirs = cli.argumentValue("search_path").split(DELIM);
add_libs = cli.argumentValue("add_libs").split(DELIM);
ignore_libs = cli.argumentValue("ignore").split(DELIM);
ignore_libs = PISet<PIString>(cli.argumentValue("ignore").split(DELIM));
qt_dir = cli.argumentValue("qtdir");
ldd = cli.argumentValue("ldd");
readelf = cli.argumentValue("Lreadelf");