mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 23:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

windows-container: enable smtk2ssrf building

Browse source 
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>
This commit is contained in:
Salvador Cuñat 2018-10-14 21:53:59 +02:00 • committed by Dirk Hohndel
parent 32df0ab0da
commit faca48f2b6
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/get-dep-lib.sh
View file

@ -16,6 +16,7 @@ CURRENT_LIBFTDI="1.3"
CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9" CURRENT_KIRIGAMI="8691651c1f0d09430416ba5fe2130647554b06a9"
CURRENT_BREEZE_ICONS="" CURRENT_BREEZE_ICONS=""
CURRENT_GRANTLEE="v5.0.0" CURRENT_GRANTLEE="v5.0.0"
CURRENT_MDBTOOLS="master"
# Checkout library from git # Checkout library from git
# Ensure specified version is checked out, # Ensure specified version is checked out,
@ -187,6 +188,9 @@ for package in "${PACKAGES[@]}" ; do
grantlee) grantlee)
git_checkout_library grantlee $CURRENT_GRANTLEE https://github.com/steveire/grantlee.git 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\"" echo "unknown package \"$package\""
exit 1 exit 1

5
scripts/windows-container/after_success.sh
View file

@ -24,7 +24,6 @@ cd ${TRAVIS_BUILD_DIR}
wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh wget -c https://raw.githubusercontent.com/dirkhh/uploadtool/master/upload.sh
bash ./upload.sh ${TRAVIS_BUILD_DIR}/../win32/subsurface/subsurface*.exe* bash ./upload.sh ${TRAVIS_BUILD_DIR}/../win32/subsurface/subsurface*.exe*
# upload smtk2ssrf # upload smtk2ssrf
#cd ${TRAVIS_BUILD_DIR}/../win32/smtk-import cd ${TRAVIS_BUILD_DIR}/../win32/smtk-import
#bash ../subsurface/upload.sh smtk2ssrf*.exe* bash ../subsurface/upload.sh smtk2ssrf*.exe*

24
scripts/windows-container/before_install.sh
View file

@ -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 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? # 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 # now set up our other dependencies
# these are either not available in MXE, or a version that's too old # 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 . googlemaps
docker exec -t builder bash subsurface/scripts/get-dep-lib.sh single . grantlee 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 # get prebuilt static mxe libraries for glib.
#echo "Get mdbtools"
#cd ${TRAVIS_BUILD_DIR}/..
#git clone https://github.com/brianb/mdbtools.git
# get prebuilt mxe libraries for mdbtools and glib.
# do not overwrite upstream prebuilt mxe binaries if there is any coincidence. # 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 echo -n "Downloading prebuilt static mxe ... "
#[[ ! -f mxe-static-minimal-994ad473.tar.xz ]] && exit 1 docker exec -t builder wget -q https://www.dropbox.com/s/2ahfkyi6rhbihtn/mxe-static-minimal-a08b3225.tar.xz
#cd mxe echo -n "Untarring ... "
#tar -xJf ../mxe-static-minimal-994ad473.tar.xz --skip-old-files docker exec -t builder tar -C /win/mxe -xJf mxe-static-minimal-a08b3225.tar.xz --skip-old-files
#ls -al usr/ echo "Done."
docker exec -t builder ln -vs /win/mxe /usr/src/mxe

3
scripts/windows-container/in-container-build.sh
View file

@ -14,5 +14,4 @@ mkdir -p win32
cd win32 cd win32
bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
# re-enable this when smtk2ssrf is figured out bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i
#bash -ex ${TRAVIS_BUILD_DIR}/packaging/windows/smtk2ssrf-mxe-build.sh -i