X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=be976737a98908c44783799a58f65d4e6162dd7d;hb=04cb58f895ed1968c5d383f747d24ccd5b3a7e1c;hp=b8c5749dba3ecdb1028c90d03bb58fe16981ae3d;hpb=6e6c47d09ae6db8568ecb3aa5b053271b26e4769;p=sigrok-util.git diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg index b8c5749..be97673 100755 --- a/cross-compile/macosx/create_dmg +++ b/cross-compile/macosx/create_dmg @@ -69,6 +69,7 @@ PYDIR="$FRAMEWORKSDIR/Python.framework/Versions/$PYVER" mkdir -p $MACOSDIR $FRAMEWORKSDIR $SHARE_DIR cp $PREFIX/bin/$APPNAME_BINARY $MACOSDIR +# Implementation detail: Shared libraries are handled below. cp -R $PREFIX/share/libsigrokdecode $SHARE_DIR rm -rf $SHARE_DIR/libsigrokdecode/decoders/**/__pycache__ rm -rf $SHARE_DIR/libsigrokdecode/decoders/common/**/__pycache__ @@ -79,7 +80,7 @@ if [ "x$APPNAME_BINARY" = "xpulseview" ]; then cp $BOOSTLIBDIR/libboost_timer-mt.dylib $FRAMEWORKSDIR cp $BOOSTLIBDIR/libboost_chrono-mt.dylib $FRAMEWORKSDIR chmod 644 $FRAMEWORKSDIR/*boost* - + # Manually copy translations ("macdeployqt" won't copy them). mkdir -p $CONTENTSDIR/translations cp $QTTRANSLATIONSDIR/qt_*.qm $CONTENTSDIR/translations @@ -112,6 +113,10 @@ install_name_tool -change \ /usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \ @executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \ $FRAMEWORKSDIR/libsigrokdecode.*.dylib +install_name_tool -change \ + /usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \ + @executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \ + $PREFIX/lib/libirmp.*.dylib # Add wrapper (sets PYTHONHOME/SIGROK_FIRMWARE_DIR/SIGROKDECODE_DIR). mv $MACOSDIR/$APPNAME_BINARY $MACOSDIR/$APPNAME_BINARY.real