sigrok-native-macosx: Fix an issue with recent boost versions.

[sigrok-util.git] / cross-compile / macosx / create_dmg

diff --git a/cross-compile/macosx/create_dmg b/cross-compile/macosx/create_dmg
index f4b36b71c2f5fb871d37aef5c62030feee32882a..fd36a273da475e556bfc0ca51d581fe302184133 100755 (executable)
--- a/cross-compile/macosx/create_dmg
+++ b/cross-compile/macosx/create_dmg
@@ -31,9 +31,10 @@ QTVER=qt@5.5
 
 # Path to Qt5 binaries.
 QTBINDIR=`brew list $QTVER | grep bin | head -n 1 | xargs dirname`
 
 # Path to Qt5 binaries.
 QTBINDIR=`brew list $QTVER | grep bin | head -n 1 | xargs dirname`

+QTTRANSLATIONSDIR=`brew --prefix $QTVER`/translations

 
 # Path to boost libraries.
 
 # 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`/../../../..
 
 # Path to Python 3 framework.
 PYTHONFRAMEWORKDIR=`brew list python3 | grep Python.framework | head -n 1 | xargs dirname`/../../../..


@@ -51,7 +52,7 @@ cd $BUILDDIR
 
 APPNAME="PulseView"
 APPNAME_BINARY="pulseview"
 
 APPNAME="PulseView"
 APPNAME_BINARY="pulseview"

-APPVER="nightly"
+APPVER="NIGHTLY"

 
 CONTENTSDIR="$APPNAME.app/Contents"
 MACOSDIR="$CONTENTSDIR/MacOS"
 
 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*
 
 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.
 $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
 
 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"
        -fs HFS+ -srcfolder "$APPNAME.app"