summaryrefslogtreecommitdiffstats
path: root/scripts/windows-container
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-07 12:46:06 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-08 12:19:39 -0700
commitb40c8de35bba632612426e9f8483a4547f5d2a0e (patch)
tree360894b4cb3b48dfbf62086c9832700716164f0e /scripts/windows-container
parentec7422feb5bb35cd8a456a67309df15c9b7ad59e (diff)
downloadsubsurface-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/windows-container')
-rw-r--r--scripts/windows-container/before_install.sh2
-rw-r--r--scripts/windows-container/in-container-build.sh2
2 files changed, 1 insertions, 3 deletions
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