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 12cc7ab1d9..e7d1097f3b 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 @@ -22,7 +22,8 @@ rsync -a "$BIN_DIR"/{system.js,TRIK.py,2D-model,checkapp} "$PWD/.. [ -r venv/bin/activate ] || "python3.${TRIK_PYTHON3_VERSION_MINOR}" -m venv venv . venv/bin/activate -python3 -m pip install pyinstaller +python3 -m pip install -U pip +python3 -m pip install pyinstaller numpy #PyInstaller provides all required modules #So we need to handle this garbage of files later (below) with proper rsync @@ -33,8 +34,11 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n --hidden-import=time \ --hidden-import=os \ --hidden-import=types \ + --hidden-import=numpy \ "$BIN_DIR"/TRIK.py +deactivate # exit python's venv + rsync -avR --remove-source-files dist/trik/./*.so* "$PWD/../data/lib/" # Remove before copying other files rm dist/trik/trik 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 901388afe4..840a787bf6 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 @@ -24,7 +24,8 @@ copy_qt_lib QtSerialPort [ -r venv/bin/activate ] || python3."${TRIK_PYTHON3_VERSION_MINOR}" -m venv venv . venv/bin/activate -python3 -m pip install pyinstaller +python3 -m pip install -U pip +python3 -m pip install pyinstaller numpy #PyInstaller provides all required modules #So we need to handle this garbage of files later (below) with proper rsync @@ -35,8 +36,11 @@ pyinstaller --clean --noconfirm --log-level DEBUG --debug noarchive --onedir --n --hidden-import=time \ --hidden-import=os \ --hidden-import=types \ + --hidden-import=numpy \ "$BIN_DIR"/TRIK.py +deactivate # exit python's venv + rsync -avR --remove-source-files dist/trik/./{*.dylib,Python} "$BUNDLE_CONTENTS/Lib" # Remove before copying other files rm dist/trik/trik