VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Updates in deployment, using libopus from macports.

Browse Source
This commit is contained in:
ZigaS 2019-03-14 12:13:20 +01:00
parent f76ed4a466
commit a5f79909d5
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
apple/deploy.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
SDRANGEL_VERSION="4.3.2" SDRANGEL_VERSION="4.5.0"
QT_VERSION="5.12.0" QT_VERSION="5.12.1"
QT_HOME="/Applications/Qt/${QT_VERSION}" QT_HOME="/Applications/Qt/${QT_VERSION}"
# Run from build directory after build # Run from build directory after build
@ -43,6 +43,12 @@ for i in `find . -name '*.dylib' -type f -not -path "./${APP_PATH}/*"`; do
fi fi
done done
# Missing ones
dply_lib /opt/install/LimeSuite/lib/libLimeSuite.18.10-1.dylib
dply_lib /opt/local/lib/libnanomsg.5.0.0.dylib
dply_lib /usr/local/lib/libmirisdr.4.dylib
dply_lib /usr/local/lib/libSoapySDR.0.7.dylib
# 2nd-pass: Symlink libs # 2nd-pass: Symlink libs
cd $APP_LIB cd $APP_LIB
for i in `find . -name '*.1.0.0.dylib' -type f -not -path "./plugins/*"`; do for i in `find . -name '*.1.0.0.dylib' -type f -not -path "./plugins/*"`; do
@ -51,13 +57,20 @@ for i in `find . -name '*.1.0.0.dylib' -type f -not -path "./plugins/*"`; do
ln -sf $i "${i/.1.0.0.dylib/.dylib}" ln -sf $i "${i/.1.0.0.dylib/.dylib}"
done done
cd ../../.. cd ../../..
pwd
LIB_PATH="SDRangel.app/Contents/Frameworks"
CUR_PATH=`pwd`
cd $LIB_PATH
# Symbolic links
ln -sf "libnanomsg.5.0.0.dylib" "libnanomsg.5.dylib"
# Deploy DMG # Deploy DMG
cd $CUR_PATH
pwd
"${QT_HOME}/clang_64/bin/macdeployqt" ./SDRangel.app \ "${QT_HOME}/clang_64/bin/macdeployqt" ./SDRangel.app \
-always-overwrite \ -always-overwrite \
-dmg \ -dmg \
-libpath=SDRangel.app/Contents/Frameworks \ -libpath=${LIB_PATH} \
-verbose=1 -verbose=1
# Add other files to DMG # Add other files to DMG
@ -66,7 +79,7 @@ DMG_RW_SRC=${DMG_SRC/.dmg/.rw.dmg}
DMG_TMP_A="/tmp/_dmg-attach" DMG_TMP_A="/tmp/_dmg-attach"
hdiutil pmap $DMG_SRC hdiutil pmap $DMG_SRC
hdiutil convert $DMG_SRC -format UDRW -o $DMG_RW_SRC hdiutil convert $DMG_SRC -format UDRW -o $DMG_RW_SRC
#hdiutil resize -limits $DMG_RW_SRC hdiutil resize -limits $DMG_RW_SRC
hdiutil attach $DMG_RW_SRC > $DMG_TMP_A hdiutil attach $DMG_RW_SRC > $DMG_TMP_A
DMG_MPATH=`cat $DMG_TMP_A | grep Volumes | awk '{ print $3 }'` DMG_MPATH=`cat $DMG_TMP_A | grep Volumes | awk '{ print $3 }'`
@ -78,7 +91,7 @@ hdiutil detach $DMG_MPATH
# Publish version # Publish version
VERIMAGIC="-v${SDRANGEL_VERSION}_`date +%Y%m%d_%H%M%S`-Qt${QT_VERSION}" VERIMAGIC="-v${SDRANGEL_VERSION}_`date +%Y%m%d_%H%M%S`-Qt${QT_VERSION}"
DMG_DEPLOY=${DMG_SRC/.dmg/${VERIMAGIC}.dmg} DMG_DEPLOY=${DMG_SRC/.dmg/${VERIMAGIC}.dmg}
hdiutil convert $DMG_RW_SRC -format UDRW -o $DMG_DEPLOY hdiutil convert $DMG_RW_SRC -format UDBZ -o $DMG_DEPLOY
rm -f $DMG_RW_SRC rm -f $DMG_RW_SRC
echo "DeployedDMG: ${DMG_DEPLOY}" echo "DeployedDMG: ${DMG_DEPLOY}"

2
sdrbase/sdrbase.pro
View File

@ -44,6 +44,7 @@ CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\serialDV" CONFIG(MSVC):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0" CONFIG(macx):INCLUDEPATH += "../../../boost_1_69_0"
CONFIG(macx):INCLUDEPATH += "/opt/local/include"
MINGW32 || MINGW64 || MSVC { MINGW32 || MINGW64 || MSVC {
HEADERS += \ HEADERS += \
@ -247,6 +248,7 @@ LIBS += -L../qrtplib/$${build_subdir} -lqrtplib
LIBS += -L../swagger/$${build_subdir} -lswagger LIBS += -L../swagger/$${build_subdir} -lswagger
macx { macx {
LIBS += -L/opt/local/lib -lopus
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/
} }