Skip to content

Commit

Permalink
Add some comments on (probably) redundant commands
Browse files Browse the repository at this point in the history
  • Loading branch information
pcolby committed Mar 15, 2019
1 parent d9d869b commit 8fe0fa9
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,20 @@ echo 'Installing hook'
cp build/qtbase/lib/QtNetwork.framework/Versions/5/QtNetwork \
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"

# @todo Consider removing this. Current Qt/OSX buildchain set the ID to
# '@rpath/QtNetwork.framework/Versions/5/QtNetwork', which should work fine.
# Whereas back in 2014 it would typically be set to an absolute path on the
# build machine. Anyway, forcing it to be based on '@executable_path/...'
# still seems to work, but we can probably drop it sometime, with testing.
install_name_tool -id \
'@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork' \
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"

# @todo Consider removing this. It actually does nothing now, since current Qt
# versions set the relevant name to '@rpath/QtCore.framework/Versions/5/QtCore'
# so the following `-change` doesn't find anything to change anymore.
install_name_tool -change \
'/usr/local/Qt-5.1.1/lib/QtCore.framework/Versions/5/QtCore' \
'/usr/local/Qt-5.5.1/lib/QtCore.framework/Versions/5/QtCore' \
'@executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore' \
"$TARGET_APP/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork"

Expand Down

0 comments on commit 8fe0fa9

Please sign in to comment.