From 2913f54d43e32f82c86e21dc9d0b22dbd1388086 Mon Sep 17 00:00:00 2001 From: Iakov 'Jake' Kirilenko Date: Thu, 20 Jul 2023 22:26:38 +0300 Subject: [PATCH] Python: add site module --- .../ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh | 3 +++ .../trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh | 3 +++ plugins/robots/thirdparty/hidapi | 2 +- qrtest/thirdparty/googletest/googletest | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh index e7d1097f3b..859f02cc07 100755 --- a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh +++ b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh @@ -34,6 +34,9 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n --hidden-import=time \ --hidden-import=os \ --hidden-import=types \ + --hidden-import=pip \ + --hidden-import=venv \ + --hidden-import=site \ --hidden-import=numpy \ "$BIN_DIR"/TRIK.py diff --git a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh index 840a787bf6..87098134f2 100755 --- a/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh +++ b/installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh @@ -36,6 +36,9 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n --hidden-import=time \ --hidden-import=os \ --hidden-import=types \ + --hidden-import=pip \ + --hidden-import=venv \ + --hidden-import=site \ --hidden-import=numpy \ "$BIN_DIR"/TRIK.py diff --git a/plugins/robots/thirdparty/hidapi b/plugins/robots/thirdparty/hidapi index d0856c05ce..5fd7a79b37 160000 --- a/plugins/robots/thirdparty/hidapi +++ b/plugins/robots/thirdparty/hidapi @@ -1 +1 @@ -Subproject commit d0856c05cecbb1522c24fd2f1ed1e144b001f349 +Subproject commit 5fd7a79b37ee4981a699558e280ba3102c463770 diff --git a/qrtest/thirdparty/googletest/googletest b/qrtest/thirdparty/googletest/googletest index 1ed6a8c67a..4a1a299b20 160000 --- a/qrtest/thirdparty/googletest/googletest +++ b/qrtest/thirdparty/googletest/googletest @@ -1 +1 @@ -Subproject commit 1ed6a8c67a0bd675149ece27bbec0ef1759854cf +Subproject commit 4a1a299b206ba250a4318f74938ea67c75c3c0c9