diff options
Diffstat (limited to 'scripts/windows-container/before_install.sh')
| -rw-r--r-- | scripts/windows-container/before_install.sh | 24 |
1 files changed, 11 insertions, 13 deletions
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 |