diff options
| author |  Simon Peter <probono@puredarwin.org> | 2017-11-10 09:35:50 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-10 10:55:01 -0800 |
| commit | 29350ceecd69ebc96583ccfba28acc22acae0750 (patch) | |
| tree | 98e3b5eb5d3e787addb18153eceac1e34b68dca3 | |
| parent | 6dd6764b6beec448a66be8c03e261bad7b1a44c7 (diff) | |
| download | subsurface-29350ceecd69ebc96583ccfba28acc22acae0750.tar.gz | |
Travis: remove linuxdeployqt workaround
Do not move around .so* files in order for linuxdeployqt to pick them up.
Signed-off-by: Simon Peter <probono@puredarwin.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | scripts/linux/travisbuild.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh index 987d71ba2..0cb8bf666 100644 --- a/scripts/linux/travisbuild.sh +++ b/scripts/linux/travisbuild.sh @@ -26,7 +26,6 @@ mkdir -p appdir/usr/plugins/ # mv googlemaps and Grantlee plugins into place mv appdir/usr/usr/local/Qt*/plugins/* appdir/usr/plugins # the usr/usr is not a typo - that's where it ends up mv appdir/usr/lib/grantlee/ appdir/usr/plugins/ -sudo mv appdir/usr/lib/* /usr/local/lib/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/160 rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage # get the linuxdeployqt tool and run it to collect the libraries @@ -35,7 +34,6 @@ chmod a+x linuxdeployqt*.AppImage unset QTDIR unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH -export LD_LIBRARY_PATH=/usr/local/lib/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/160 ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -qmldir=./subsurface/map-widget/ -verbose=2 # create the AppImage |