diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-10-07 12:46:06 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-08 12:19:39 -0700 |
| commit | b40c8de35bba632612426e9f8483a4547f5d2a0e (patch) | |
| tree | 360894b4cb3b48dfbf62086c9832700716164f0e /scripts/linux/travisbuild.sh | |
| parent | ec7422feb5bb35cd8a456a67309df15c9b7ad59e (diff) | |
| download | subsurface-b40c8de35bba632612426e9f8483a4547f5d2a0e.tar.gz | |
build-system: remove Grantlee references from legacy scripts
I debated about this commit... we don't use these scripts any more, but it
seems like it would be worse to leave the Grantlee references in them. Yet of
course this is all no longer tested. Maybe it is time to delete the scripts
from the tree.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/linux/travisbuild.sh')
| -rw-r--r-- | scripts/linux/travisbuild.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/linux/travisbuild.sh b/scripts/linux/travisbuild.sh index 906d0efd7..e9b3fa1a0 100644 --- a/scripts/linux/travisbuild.sh +++ b/scripts/linux/travisbuild.sh @@ -33,9 +33,8 @@ grep -A1 RESULT\ :\ TestParsePerformance subsurface/build/tests/Testing/Temporar # set up the appdir mkdir -p appdir/usr/plugins/ -# mv googlemaps and Grantlee plugins into place +# mv googlemaps 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/ 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 rm -rf appdir/usr/usr appdir/usr/lib/cmake appdir/usr/lib/pkgconfig @@ -65,8 +64,6 @@ cp -f subsurface/smtk-import/smtk2ssrf.desktop smtk2ssrf_appdir/ cp -f install-root/bin/smtk2ssrf smtk2ssrf_appdir/usr/bin/ cp -f install-root/lib/libdivecomputer.so.0 smtk2ssrf_appdir/usr/lib/ cp -f install-root/lib/libgit2* smtk2ssrf_appdir/usr/lib/ -# Why is Grantlee needed? We have built subsurface without printing support!!! -cp -f install-root/lib/libGrantlee* smtk2ssrf_appdir/usr/lib/ cp -rf appdir/usr/plugins/{bearer,iconengines,imageformats,platforms,xcbglintegrations} smtk2ssrf_appdir/usr/plugins ./linuxdeployqt*.AppImage ./smtk2ssrf_appdir/smtk2ssrf.desktop -bundle-non-qt-libs -verbose=2 |