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>

6 files changed, 6 insertions, 38 deletions

diff --git a/scripts/linux-trusty-qt512/in-container-build.sh b/scripts/linux-trusty-qt512/in-container-build.sh
index e0b888390..313f7e7e6 100644
--- a/scripts/linux-trusty-qt512/in-container-build.sh
+++ b/scripts/linux-trusty-qt512/in-container-build.sh
@@ -22,9 +22,8 @@ export QT_DEBUG_PLUGINS=1
 # 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/5.12.4/gcc_64/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
 cp /ssllibs/libssl.so appdir/usr/lib/libssl.so.1.1
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
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
diff --git a/scripts/windows-container/before_install.sh b/scripts/windows-container/before_install.sh
index f6b898c6d..5635cb450 100644
--- a/scripts/windows-container/before_install.sh
+++ b/scripts/windows-container/before_install.sh
@@ -23,7 +23,6 @@ autoreconf --install
 # the intended layout as seen inside the container is
 # /win/subsurface # sources that we are testing
 #     /win32      # binaries that are build
-#     /grantlee
 #     /libzip
 #     /hidapi
 #     /googlemaps
@@ -46,7 +45,6 @@ docker exec -t builder apt-get install -y ca-certificates libtool
 docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . libzip
 docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . hidapi
 docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . googlemaps
-docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . grantlee
 
 # smtk2ssrf build
 docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . mdbtools
diff --git a/scripts/windows-container/in-container-build.sh b/scripts/windows-container/in-container-build.sh
index 6f1bf0cb2..fd38d7ba0 100644
--- a/scripts/windows-container/in-container-build.sh
+++ b/scripts/windows-container/in-container-build.sh
@@ -3,7 +3,7 @@
 # installer on Travis
 #
 # working directory is assumed to be the directory including all the
-# source directories (subsurface, googlemaps, grantlee, etc)
+# source directories (subsurface, googlemaps, etc)
 # in order to be compatible with the assumed layout in the MXE script, we
 # need to create the secondary build directory
 
diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh
index 1317e7288..e0acf6bf5 100644
--- a/scripts/windows/before_install.sh
+++ b/scripts/windows/before_install.sh
@@ -59,15 +59,6 @@ echo "Get googlemaps"
 cd ${TRAVIS_BUILD_DIR}/..
 git clone https://github.com/Subsurface/googlemaps.git
 
-echo "Get Grantlee"
-cd ${TRAVIS_BUILD_DIR}/..
-git clone https://github.com/steveire/grantlee.git
-cd grantlee
-if ! git checkout v5.0.0 ; then
-	echo "can't check out v5.0.0 of grantlee -- giving up"
-	exit 1
-fi
-
 echo "Get mdbtools"
 cd ${TRAVIS_BUILD_DIR}/..
 git clone https://github.com/brianb/mdbtools.git