diff options
Diffstat (limited to 'scripts/mac/travisbuild.sh')
| -rw-r--r-- | scripts/mac/travisbuild.sh | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/scripts/mac/travisbuild.sh b/scripts/mac/travisbuild.sh index f056f3e86..40fad844f 100644 --- a/scripts/mac/travisbuild.sh +++ b/scripts/mac/travisbuild.sh @@ -1,5 +1,8 @@ #!/bin/bash +set -x +set -e + # this gets executed by Travis when building an App for Mac # it gets started from inside the subsurface directory @@ -12,8 +15,7 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH cd ${TRAVIS_BUILD_DIR}/.. DIR=$(pwd) -#bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit # we need to build 'both' and need to build without BT and other variations that we want to exercise -bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -skip-googlemaps +bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit cd ${TRAVIS_BUILD_DIR}/build @@ -31,17 +33,21 @@ for i in libgit2 libGrantlee_TextDocument.dylib libGrantlee_Templates.dylib; do install_name_tool -change ${OLD} @executable_path/../Frameworks/${SONAME} ${EXECUTABLE} install_name_tool -id @executable_path/../Frameworks/${SONAME} Subsurface.app/Contents/Frameworks/${SONAME} # also fix incorrect references inside of libgit2 - if [[ "$i" = "libgit2" ]] ; then - CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME} - SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\ -f1 | tr -d "\t") - install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME} - fi + # if [[ "$i" = "libgit2" ]] ; then + # CURLLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libcurl | cut -d\ -f1 | tr -d "\t") + # if [ ! -z $CURLLIB ] ; then + # install_name_tool -change ${CURLLIB} @executable_path/../Frameworks/$(basename ${CURLLIB}) Subsurface.app/Contents/Frameworks/${SONAME} + # fi + # SSHLIB=$(otool -L Subsurface.app/Contents/Frameworks/${SONAME} | grep libssh2 | cut -d\ -f1 | tr -d "\t") + # if [ ! -z $SSHLIB ] ; then + # install_name_tool -change ${SSHLIB} @executable_path/../Frameworks/$(basename ${SSHLIB}) Subsurface.app/Contents/Frameworks/${SONAME} + # fi + # fi fi done # next, copy libssh2.1 -cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks +# cp ${DIR}/install-root/lib/libssh2.1.dylib Subsurface.app/Contents/Frameworks # next, replace @rpath references with @executable_path references in Subsurface RPATH=$(otool -L ${EXECUTABLE} | grep rpath | cut -d\ -f1 | tr -d "\t" | cut -b 8- ) |