diff options
Diffstat (limited to 'scripts/mac')
| -rw-r--r-- | scripts/mac/travisbuild.sh | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index 2ffe51d6b..e231682ee 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -30,8 +30,10 @@ make export-html LIBRARY_PATH=${DIR}/install-root/lib make -j2 install # now adjust a few references that macdeployqt appears to miss +# there used to be more - having the for-loop for just one seems overkill, but I +# wouldn't be surprised if there will be more again in the future, so leave it for now EXECUTABLE=Subsurface.app/Contents/MacOS/Subsurface -for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do +for i in libgit2 ; do OLD=$(otool -L ${EXECUTABLE} | grep $i | cut -d\ -f1 | tr -d "\t") if [[ ! -z ${OLD} && ! -f Subsurface.app/Contents/Frameworks/$(basename ${OLD}) ]] ; then # copy the library into the bundle and make sure its id and the reference to it are correct @@ -48,22 +50,3 @@ for i in ${RPATH}; do install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${EXECUTABLE} done -# next deal with libGrantlee -LIBG=$(ls Subsurface.app/Contents/Frameworks/libGrantlee_Templates*dylib) -for i in QtScript.framework/Versions/5/QtScript QtCore.framework/Versions/5/QtCore ; do - install_name_tool -change @rpath/$i @executable_path/../Frameworks/$i ${LIBG} -done - -# clean up shared library dependency in the Grantlee plugins -for i in Subsurface.app/Contents/PlugIns/grantlee/5.0/*.so; do - OLD=$(otool -L $i | grep libGrantlee_Templates | cut -d\ -f1 | tr -d "\t") - SONAME=$(basename $OLD ) - install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} $i; - OLD=$(otool -L $i | grep QtCore | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${OLD} @executable_path/../Frameworks/QtCore.framework/QtCore $i; - mv $i Subsurface.app/Contents/PlugIns/grantlee -done -rmdir Subsurface.app/Contents/PlugIns/grantlee/5.0 -pushd Subsurface.app/Contents/PlugIns/grantlee -ln -s . 5.0 -popd |