Skip to content

Commit b3d33cb

Browse files
committed
Fix for PyInstaller
1 parent 40a2ee9 commit b3d33cb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-linux-gnu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n
4242

4343
deactivate # exit python's venv
4444

45-
rsync -avR --remove-source-files dist/trik/./*.so* "$PWD/../data/lib/"
45+
rsync -avR --remove-source-files dist/trik/_internal/./*.so* "$PWD/../data/lib/"
4646
# Remove before copying other files
4747
rm dist/trik/trik
48-
rsync -avRm --ignore-missing-args --delete --delete-after dist/trik/./* "$PWD/../data/lib/python-runtime"
48+
rsync -avRm --ignore-missing-args --delete --delete-after dist/trik/_internal/./* "$PWD/../data/lib/python-runtime"
4949

5050
#PythonQt requires for dlopen'ing
5151
pushd "$PWD/../data/lib" && for f in libpython3.*.so.* ; do ln -svf "$f" "$(echo "$f" | cut -d . -f 1-3)" ; done ; popd

installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n
4444

4545
deactivate # exit python's venv
4646

47-
rsync -avR --remove-source-files dist/trik/./{*.dylib,Python} "$BUNDLE_CONTENTS/Lib"
47+
rsync -avR --remove-source-files dist/trik/_internal/./{*.dylib,Python} "$BUNDLE_CONTENTS/Lib"
4848
# Remove before copying other files
4949
rm dist/trik/trik
50-
rsync -avRm --delete --delete-after dist/trik/./* "$BUNDLE_CONTENTS/Lib/python-runtime"
50+
rsync -avRm --delete --delete-after dist/trik/_internal/./* "$BUNDLE_CONTENTS/Lib/python-runtime"
5151

5252
#Add Python runtime libraries
5353
PYTHON_LIBNAME=$("python3.${TRIK_PYTHON3_VERSION_MINOR}-config" --prefix)/Python

0 commit comments

Comments
 (0)