X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=002927ecf16a56133f9da9b21775c10bc2f4d51e;hb=3e55303c7718421e1a56299b5e7a7e7bce198ecc;hp=f4b36b71c2f5fb871d37aef5c62030feee32882a;hpb=20e302a299c6b625aed33cc0865d8d8f31969697;p=sigrok-util.git diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg index f4b36b7..002927e 100755 --- a/cross-compile/macosx/create_dmg +++ b/cross-compile/macosx/create_dmg @@ -31,6 +31,7 @@ QTVER=qt@5.5 # Path to Qt5 binaries. QTBINDIR=`brew list $QTVER | grep bin | head -n 1 | xargs dirname` +QTTRANSLATIONSDIR=`brew --prefix $QTVER`/translations # Path to boost libraries. BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname` @@ -51,7 +52,7 @@ cd $BUILDDIR APPNAME="PulseView" APPNAME_BINARY="pulseview" -APPVER="nightly" +APPVER="NIGHTLY" CONTENTSDIR="$APPNAME.app/Contents" MACOSDIR="$CONTENTSDIR/MacOS" @@ -72,6 +73,13 @@ 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 +for lang in "de"; do + cp $QTTRANSLATIONSDIR/qt_$lang.qm $CONTENTSDIR/translations + cp $QTTRANSLATIONSDIR/qtbase_$lang.qm $CONTENTSDIR/translations +done + $QTBINDIR/macdeployqt $APPNAME.app # Copy Python framework and fix it up. @@ -107,5 +115,5 @@ chmod 755 $MACOSDIR/$APPNAME_BINARY cp ../contrib/Info.plist $CONTENTSDIR cp ../contrib/pulseview.icns $CONTENTSDIR/Resources -hdiutil create "${APPNAME}_${APPVER}.dmg" -volname "$APPNAME $APPVER" \ +hdiutil create "${APPNAME}-${APPVER}.dmg" -volname "$APPNAME $APPVER" \ -fs HFS+ -srcfolder "$APPNAME.app"