X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fcreate_dmg;h=fd36a273da475e556bfc0ca51d581fe302184133;hp=7b4b12c73ca6c725339a8836f381179aad8d4451;hb=b1181fe12749e653f74285f71edd09dd6fc859ff;hpb=5d2c0f55090fad9c99b97fc91ffdb66d19a12578;ds=sidebyside

diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg
index 7b4b12c..fd36a27 100755
--- a/cross-compile/macosx/create_dmg
+++ b/cross-compile/macosx/create_dmg
@@ -26,16 +26,20 @@ 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`
+QTTRANSLATIONSDIR=`brew --prefix $QTVER`/translations
 
 # Path to boost libraries.
-BOOSTLIBDIR=`brew list boost | grep libboost_system | head -n 1 | xargs dirname`
+BOOSTLIBDIR=`brew list boost | grep libboost_system | grep -v cmake | 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 +52,7 @@ cd $BUILDDIR
 
 APPNAME="PulseView"
 APPNAME_BINARY="pulseview"
-APPVER="nightly"
+APPVER="NIGHTLY"
 
 CONTENTSDIR="$APPNAME.app/Contents"
 MACOSDIR="$CONTENTSDIR/MacOS"
@@ -69,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.
@@ -92,11 +103,11 @@ 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
 
-# Add PulseView wrapper script that sets PYTHONHOME and SIGROKDECODE_DIR.
+# Add PulseView wrapper (sets PYTHONHOME/SIGROK_FIRMWARE_DIR/SIGROKDECODE_DIR).
 mv $MACOSDIR/$APPNAME_BINARY $MACOSDIR/$APPNAME_BINARY.real
 cp ../contrib/pulseview $MACOSDIR
 chmod 755 $MACOSDIR/$APPNAME_BINARY
@@ -104,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"