X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=734852830a4980c94d48487376310475e662d694;hb=006ffd960318d1348c8b9ed0009506cccbe3acd7;hp=d08cd7e14aa26da59f30e18a9a7a001c8365180d;hpb=c6ed5a3a77da544ccbbd82aee45d8622ac1ce77e;p=sigrok-util.git diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg index d08cd7e..7348528 100755 --- a/cross-compile/macosx/create_dmg +++ b/cross-compile/macosx/create_dmg @@ -26,8 +26,11 @@ PREFIX=$HOME/sr_macosx # The path where to download files to and where to build packages. BUILDDIR=./build_app +# We use Qt 5.5 in order to remain compatible with more versions of Mac OS X. +QTVER=qt@5.5 + # Path to Qt5 binaries. -QTBINDIR=`brew list qt5 | grep bin | head -n 1 | xargs dirname` +QTBINDIR=`brew list $QTVER | grep bin | head -n 1 | xargs dirname` # Path to boost libraries. BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname` @@ -48,7 +51,7 @@ cd $BUILDDIR APPNAME="PulseView" APPNAME_BINARY="pulseview" -APPVER="nightly" +APPVER="NIGHTLY" CONTENTSDIR="$APPNAME.app/Contents" MACOSDIR="$CONTENTSDIR/MacOS" @@ -104,5 +107,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"