comparison deploy/osx/paths.sh @ 568:96a0e169b70f with-dependencies

Merge from default branch
author Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
date Tue, 14 May 2013 14:47:30 +0100
parents 4481a2ca375d
children 5462ac97d28f
comparison
equal deleted inserted replaced
559:881a3f0dd268 568:96a0e169b70f
6 echo "Provide appname without the .app extension, please" 6 echo "Provide appname without the .app extension, please"
7 exit 2 7 exit 2
8 fi 8 fi
9 9
10 echo 10 echo
11 echo "I expect you to have already copied QtCore, QtNetwork, QtGui and QtXml to " 11 echo "I expect you to have already copied QtCore, QtNetwork, QtGui, QtXml and QtWidgets to "
12 echo "$app.app/Contents/Frameworks -- expect errors to follow if they're missing" 12 echo "$app.app/Contents/Frameworks -- expect errors to follow if they're missing"
13 echo 13 echo
14 14
15 echo "Fixing up loader paths in binaries..." 15 echo "Fixing up loader paths in binaries..."
16 16
17 install_name_tool -id QtCore "$app.app/Contents/Frameworks/QtCore" 17 install_name_tool -id QtCore "$app.app/Contents/Frameworks/QtCore"
18 install_name_tool -id QtGui "$app.app/Contents/Frameworks/QtGui" 18 install_name_tool -id QtGui "$app.app/Contents/Frameworks/QtGui"
19 install_name_tool -id QtNetwork "$app.app/Contents/Frameworks/QtNetwork" 19 install_name_tool -id QtNetwork "$app.app/Contents/Frameworks/QtNetwork"
20 install_name_tool -id QtXml "$app.app/Contents/Frameworks/QtXml" 20 install_name_tool -id QtXml "$app.app/Contents/Frameworks/QtXml"
21 install_name_tool -id QtWidgets "$app.app/Contents/Frameworks/QtWidgets"
21 22
22 find "$app.app" -name \*.dylib -print | while read x; do 23 find "$app.app" -name \*.dylib -print | while read x; do
23 install_name_tool -id "`basename \"$x\"`" "$x" 24 install_name_tool -id "`basename \"$x\"`" "$x"
24 done 25 done
25 26
26 for fwk in QtCore QtGui QtNetwork QtXml QtSvg; do 27 for fwk in QtCore QtGui QtNetwork QtXml QtWidgets; do
27 find "$app.app" -type f -print | while read x; do 28 find "$app.app" -type f -print | while read x; do
28 current=$(otool -L "$x" | grep "$fwk" | grep amework | awk '{ print $1; }') 29 current=$(otool -L "$x" | grep "$fwk" | grep amework | awk '{ print $1; }')
29 [ -z "$current" ] && continue 30 [ -z "$current" ] && continue
30 echo "$x has $current" 31 echo "$x has $current"
31 relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \ 32 relative=$(echo "$x" | sed -e "s,$app.app/Contents/,," \