X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;fp=cross-compile%2Fmacosx%2Fcreate_dmg;h=effe378cf08c39026317d3ba5f456761d618b2fb;hb=daa83fdabbdfd13c12510be7c08b02b5f5708bbe;hp=b8c5749dba3ecdb1028c90d03bb58fe16981ae3d;hpb=625617b09c84c26de778d1756697ca7f26b7f8b7;p=sigrok-util.git diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg index b8c5749..effe378 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 \ + $FRAMEWORKSDIR/libirmp.*.dylib # Add wrapper (sets PYTHONHOME/SIGROK_FIRMWARE_DIR/SIGROKDECODE_DIR). mv $MACOSDIR/$APPNAME_BINARY $MACOSDIR/$APPNAME_BINARY.real