X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=734852830a4980c94d48487376310475e662d694;hb=61c873afc1d5be37b5592ab47a412605414ac76f;hp=0b2326bd7e380a39c3cdfd4bb942265870015c76;hpb=ffbad1654cdd9263a964873d95535ed66a5011b4;p=sigrok-util.git

diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg
index 0b2326b..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`
@@ -35,7 +38,7 @@ BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname`
 # Path to Python 3 framework.
 PYTHONFRAMEWORKDIR=`brew list python3 | grep Python.framework | head -n 1 | xargs dirname`/../../../..
 
-PYVER="3.6"
+PYVER="3.7"
 
 # You usually don't need to change anything below this line.
 
@@ -48,7 +51,7 @@ cd $BUILDDIR
 
 APPNAME="PulseView"
 APPNAME_BINARY="pulseview"
-APPVER="nightly"
+APPVER="NIGHTLY"
 
 CONTENTSDIR="$APPNAME.app/Contents"
 MACOSDIR="$CONTENTSDIR/MacOS"
@@ -92,7 +95,7 @@ rm -rf $PYDIR/lib/python$PYVER/**/__pycache__
 rm -rf $PYDIR/lib/python$PYVER/**/**/__pycache__
 rm -rf $PYDIR/Resources
 install_name_tool -change \
-	/usr/local/opt/python3/Frameworks/Python.framework/Versions/$PYVER/Python \
+	/usr/local/opt/python/Frameworks/Python.framework/Versions/$PYVER/Python \
 	@executable_path/../Frameworks/Python.framework/Versions/$PYVER/Python \
 	$FRAMEWORKSDIR/libsigrokdecode.*.dylib
 
@@ -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"