windows-container: enable smtk2ssrf building

Enable building of SmartTrak divelogs importer.
A new, lighter, tarball for mxe static libraries has been built, as it
seems impossible to build mdbtools with shared libraries (see mxe's
build matrix). The tarball doesn't include prebuilt mdbtools and we
build from source via build script.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>

4 files changed, 18 insertions, 18 deletions

diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh
index 67931c4d4..ba669305f 100755
--- a/scripts/get-dep-lib.sh
+++ b/scripts/get-dep-lib.sh
@@ -16,6 +16,7 @@ CURRENT_LIBFTDI="1.3"
 CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9"
 CURRENT_BREEZE_ICONS=""
 CURRENT_GRANTLEE="v5.0.0"
+CURRENT_MDBTOOLS="master"
 
 # Checkout library from git
 # Ensure specified version is checked out,
@@ -187,6 +188,9 @@ for package in "${PACKAGES[@]}" ; do
 		grantlee)
 			git_checkout_library grantlee $CURRENT_GRANTLEE https://github.com/steveire/grantlee.git
 			;;
+		mdbtools)
+			git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git
+			;;
 		*)
 			echo "unknown package \"$package\""
 			exit 1
diff --git a/scripts/windows-container/after_success.sh b/scripts/windows-container/after_success.sh
index a6c51a986..f8b32361d 100644
--- a/scripts/windows-container/after_success.sh
+++ b/scripts/windows-container/after_success.sh
@@ -24,7 +24,6 @@ cd ${TRAVIS_BUILD_DIR}
 wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh
 bash ./upload.sh ${TRAVIS_BUILD_DIR}/../win32/subsurface/subsurface*.exe*
 
-
 # upload smtk2ssrf
-#cd ${TRAVIS_BUILD_DIR}/../win32/smtk-import
-#bash ../subsurface/upload.sh smtk2ssrf*.exe*
+cd ${TRAVIS_BUILD_DIR}/../win32/smtk-import
+bash ../subsurface/upload.sh smtk2ssrf*.exe*
diff --git a/scripts/windows-container/before_install.sh b/scripts/windows-container/before_install.sh
index 3c4732167..bcfcf761a 100644
--- a/scripts/windows-container/before_install.sh
+++ b/scripts/windows-container/before_install.sh
@@ -37,7 +37,8 @@ mkdir -p win32
 docker run -v $PWD/win32:/win/win32 -v $PWD/subsurface:/win/subsurface --name=builder -w /win -d dirkhh/mxe-build-container:0.6 /bin/sleep 60m
 
 # for some reason this package was installed but still isn't there?
-docker exec -t builder apt-get install -y ca-certificates
+# hmmmm. The container doesn't seem to have libtool installed
+docker exec -t builder apt-get install -y ca-certificates libtool
 
 # now set up our other dependencies
 # these are either not available in MXE, or a version that's too old
@@ -46,17 +47,14 @@ 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
 
-# the rest we'll need when we enable smtk2ssrf
-
-#echo "Get mdbtools"
-#cd ${TRAVIS_BUILD_DIR}/..
-#git clone https://github.com/brianb/mdbtools.git
-
-# get prebuilt mxe libraries for mdbtools and glib.
+# get prebuilt static mxe libraries for glib.
 # do not overwrite upstream prebuilt mxe binaries if there is any coincidence.
-#wget https://www.dropbox.com/s/842skyusb96ii1u/mxe-static-minimal-994ad473.tar.xz
-#[[ ! -f mxe-static-minimal-994ad473.tar.xz ]] && exit 1
-#cd mxe
-#tar -xJf ../mxe-static-minimal-994ad473.tar.xz --skip-old-files
-#ls -al usr/
+echo -n "Downloading prebuilt static mxe ... "
+docker exec -t builder wget -q https://www.dropbox.com/s/2ahfkyi6rhbihtn/mxe-static-minimal-a08b3225.tar.xz
+echo -n "Untarring ... "
+docker exec -t builder tar -C /win/mxe -xJf mxe-static-minimal-a08b3225.tar.xz --skip-old-files
+echo "Done."
+docker exec -t builder ln -vs /win/mxe /usr/src/mxe
diff --git a/scripts/windows-container/in-container-build.sh b/scripts/windows-container/in-container-build.sh
index ca5e15b08..bd04bb425 100644
--- a/scripts/windows-container/in-container-build.sh
+++ b/scripts/windows-container/in-container-build.sh
@@ -14,5 +14,4 @@ mkdir -p win32
 cd win32
 bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
 
-# re-enable this when smtk2ssrf is figured out
-#bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/smtk2ssrf-mxe-build.sh -i
+bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i