From b3d33cb2bdde031b9e4822bba6acc29e55b4513b Mon Sep 17 00:00:00 2001 From: Iakov 'Jake' Kirilenko Date: Wed, 4 Oct 2023 14:48:00 +0300 Subject: [PATCH] Fix for PyInstaller --- .../ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh | 4 ++-- .../trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 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 859f02cc07..5b98dce37b 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 @@ -42,10 +42,10 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n deactivate # exit python's venv -rsync -avR --remove-source-files dist/trik/./*.so* "$PWD/../data/lib/" +rsync -avR --remove-source-files dist/trik/_internal/./*.so* "$PWD/../data/lib/" # Remove before copying other files rm dist/trik/trik -rsync -avRm --ignore-missing-args --delete --delete-after dist/trik/./* "$PWD/../data/lib/python-runtime" +rsync -avRm --ignore-missing-args --delete --delete-after dist/trik/_internal/./* "$PWD/../data/lib/python-runtime" #PythonQt requires for dlopen'ing pushd "$PWD/../data/lib" && for f in libpython3.*.so.* ; do ln -svf "$f" "$(echo "$f" | cut -d . -f 1-3)" ; done ; popd 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 87098134f2..ccebe42d54 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 @@ -44,10 +44,10 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n deactivate # exit python's venv -rsync -avR --remove-source-files dist/trik/./{*.dylib,Python} "$BUNDLE_CONTENTS/Lib" +rsync -avR --remove-source-files dist/trik/_internal/./{*.dylib,Python} "$BUNDLE_CONTENTS/Lib" # Remove before copying other files rm dist/trik/trik -rsync -avRm --delete --delete-after dist/trik/./* "$BUNDLE_CONTENTS/Lib/python-runtime" +rsync -avRm --delete --delete-after dist/trik/_internal/./* "$BUNDLE_CONTENTS/Lib/python-runtime" #Add Python runtime libraries PYTHON_LIBNAME=$("python3.${TRIK_PYTHON3_VERSION_MINOR}-config" --prefix)/Python