Skip to content

Add python runtime into macOS installer #1347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iakov merged 1 commit into from
Jun 8, 2021
Merged

Add python runtime into macOS installer #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer/packages/qreal-base/ru.qreal.root/meta/prebuild-linux-gnu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cp -pr $BIN_DIR/libqrgui-thirdparty.so* $PWD/../
cp -pr $BIN_DIR/libqrgui-tool-plugin-interface.so* $PWD/../data/lib/
cp -pr $BIN_DIR/libqrgui-facade.so* $PWD/../data/lib/
cp $BIN_DIR/patcher $PWD/../data/bin/
cp $BIN_DIR/trik-studio $PWD/../data/bin/$PRODUCT
cp "$BIN_DIR"/trik-studio "$PWD/../data/bin/${PRODUCT}.bin"
cp $BIN_DIR/plugins/tools/libupdatesChecker.so $PWD/../data/lib/plugins/tools/
cp $BIN_DIR/plugins/tools/libsubprogramsImporterExporter.so $PWD/../data/lib/plugins/tools/

Expand Down
5 changes: 3 additions & 2 deletions installer/packages/qreal-base/ru.qreal.root/meta/prebuild-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,12 @@ fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/libqrgui-facade.1.0.0.dylib"
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/libupdatesChecker.dylib"
fix_qreal_dependencies "$BUNDLE_CONTENTS/Lib/plugins/tools/libsubprogramsImporterExporter.dylib"

mv "$BUNDLE_CONTENTS/MacOS/trik-studio" "$BUNDLE_CONTENTS/MacOS/$PRODUCT"
mv "$BUNDLE_CONTENTS/MacOS/trik-studio" "$BUNDLE_CONTENTS/MacOS/trik-studio.bin"
cp "$INSTALLER_ROOT/platform/$PRODUCT" "$BUNDLE_CONTENTS/MacOS/"
sed -i.bak s/qreal/trik-studio/g "$BUNDLE_CONTENTS/Info.plist"
sed -i.bak s/yourcompany/cybertech/g "$BUNDLE_CONTENTS/Info.plist"
rm -f "$BUNDLE_CONTENTS/Info.plist.bak"
fix_qreal_dependencies "$BUNDLE_CONTENTS/MacOS/$PRODUCT"
fix_qreal_dependencies "$BUNDLE_CONTENTS/MacOS/${PRODUCT}.bin"
fix_qreal_dependencies "$BUNDLE_CONTENTS/MacOS/patcher"

copy_qt_lib QtCore
Expand Down
4 changes: 2 additions & 2 deletions installer/packages/trik-studio/ru.qreal.root.trik.core/meta/prebuild-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ rm dist/trik/trik
rsync -avRm --delete --delete-after dist/trik/./* "$BUNDLE_CONTENTS/Lib/python-runtime"

#Add Python runtime libraries
#PYTHON_LIBNAME=$(python3-config --prefix)/Python
PYTHON_LIBNAME=$(python3-config --prefix)/Python
#cp -fpR "$PYTHON_LIBNAME" "$BUNDLE_CONTENTS/Lib"
#find "$BUNDLE_CONTENTS/Lib" -type f -name '*.dylib' -print0 | xargs -0n1 install_name_tool -change "$PYTHON_LIBNAME" @rpath/../Lib/Python
find "$BUNDLE_CONTENTS/Lib" -type f -name '*.dylib' -print0 | xargs -0n1 install_name_tool -change "$PYTHON_LIBNAME" @rpath/../Lib/Python
15 changes: 13 additions & 2 deletions installer/platform/trik-studio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@
set -ueo pipefail
cd "$(dirname "$0")"

case $(uname -s) in
Linux)
TRIK_PYTHONPATH_BUNDLE_DIR="$PWD"/lib/python-runtime
cd bin
;;
Darwin)
TRIK_PYTHONPATH_BUNDLE_DIR="$PWD"/../Lib/python-runtime
;;
* ) echo "Unsupported platform" ;;
esac

#TODO: pack corresponding python3 runtime into installer and checker packages.
# Otherwise, we can have a problem with version mismatch
if [ -z ${TRIK_PYTHONPATH+x} ] ; then
export TRIK_PYTHONPATH=.:"$PWD"/lib/python-runtime/base_library.zip:"$PWD"/lib/python-runtime/lib-dynload:"$PWD"/lib/python-runtime
export TRIK_PYTHONPATH=.:"${TRIK_PYTHONPATH_BUNDLE_DIR}/base_library.zip:${TRIK_PYTHONPATH_BUNDLE_DIR}/lib-dynload:${TRIK_PYTHONPATH_BUNDLE_DIR}"
fi

exec bin/trik-studio "$@"
exec ./trik-studio.bin "$@"