summaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)Author
2017-03-11Add missing dependencies for Windows run of testsGravatar Jeremie Guichard
Qt plugins and some other dependencies cannot be copied by CMake install targets. They need to be manually deployed to staging_tests directory too. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-09Simplify some testsGravatar Cristian Ionescu-Idbohrn
Because `[ "$foo" != "" ] is equivalent to `[ "$foo" ]' in all POSIX shells. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-09Remove useless quotesGravatar Cristian Ionescu-Idbohrn
Don't quote if you don't have to. Spend those cpu cycles on doing something more useful, instead. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-09Use `command' (shell builtin and POSIX) insteadGravatar Cristian Ionescu-Idbohrn
The `which' command is a fork and possible not standard in various distributions, or builtin in certain (odd)? shells, like `zsh'. Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-07Fix syntax error in android/build.shGravatar Willem Ferguson
Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Rework build.shGravatar Anton Lundin
This reworks build.sh for proper argument parsing and variable quoting. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Auto install QtGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Upgrade Qt to 5.8Gravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android: Move suggested/expected Qt install to just QtGravatar Anton Lundin
In the Qt installer, there is a MaintenanceTool which can upgrade your install, so don't install in a "versioned" directory, just install in a plain Qt-directory. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Auto accept android sdk licenseGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Quiet down unzipGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Quiet down wgetGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Add unzip as prerequisiteGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Add wget as prerequisiteGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Fail fast and at pointGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06android-wrapper: Give a negative exit code on errorGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-04Android build wrapper: sometimes quotes hurt youGravatar Dirk Hohndel
Shellcheck wanted quotes around "$USE_X" - but that makes the script fail if you run it without the '-x' argument. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-03Extend Android wrapper shell to be smarterGravatar Dirk Hohndel
Move it to packaging/android where it belongs Use direct URLs to download Android components Make sure required packages are installed (only tested on Ubuntu) Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-29MXE windows build script mxe-based-build.sh updatesGravatar Stefan Fuchs
Updates mainly in the comments of the MXE build script: - File system layout: different proposal - Hint to not use MXE current version from git - MXE build JOBS setting to (very) safe value of 1 - export CXXFLAGS=-std=c++11 added for marble build
2017-01-21Android build.sh: fix libcrypto dependency in libsslGravatar Dirk Hohndel
Using a binary patch seems harch, but it also seems to work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-21Android build.sh: don't try to link against host http_parserGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-21Small fix for Android build.shGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-12android: Document controlling env-varsGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-12android: build.sh white space cleanupGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-12android: Introduce propper quoting in build.shGravatar Anton Lundin
This where quoting issues found by shellcheck. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-01-02MXE build script: update to match current mxeGravatar Dirk Hohndel
Many of the hacks I used to need are no longer necessary. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-02Android build: add comments on filesystem layoutGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Update from 2016 to 2017. Happy new year!Gravatar Henrik Brautaset Aronsen
Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-01Fix MacOS make-package scriptGravatar Dirk Hohndel
We need the full path to the local libssh in order to replace it with the correct path. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-28android: Copy android files to the expected nameGravatar Anton Lundin
android-mobile nowadays hardcoded in CMakeLists.txt, so workaround it here. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-12-28android: Upgrade suggested ndkGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-15Small fix for Ubuntu buildsGravatar Dirk Hohndel
This makes the code slightly less error prone, I hope. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-15Add yakkety (16.10) to Ubuntu packagingGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-20iOS build: add required key for iOS 10Gravatar Dirk Hohndel
This one's weird. We actually don't access the Photo Library. But maybe it's the access to the local files (in order to store the dive data) that causes this? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-19iOS build: adjust configure flag for libdivecomputerGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-10iOS build: no longer request location informationGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-04Update the README for building the iOS versionGravatar Dirk Hohndel
This still isn't quite straight forward, but at least now the README matches the process that I use again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-04iOS build: re-enable building libraries for the simulatorGravatar Dirk Hohndel
We now build Kirigami as part of Subsurface-mobile itself, so the simulator builds work again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-28Android build: don't try to bundle libssh2, eitherGravatar Dirk Hohndel
Since we don't link against it, no need to bundle it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-28Android build: don't link against libssh2Gravatar Dirk Hohndel
We don't use ssh-based git in Subsurface-mobile, so there's no reason to link against it. This should hopefully fix the current issues with the Android APK on some devices. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-24Android build: try to create APK that works on Android 7.0Gravatar Dirk Hohndel
It appears that instead of statically linking against ssl/crypto/ssh2, you instead have to dynamically link against it and then bundle the library in the APK. The documentation is not 100% clear and I don't have an Android Nougat device to test this with, so for now this is an attempt. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-18Don't build Kirigami as a libraryGravatar Dirk Hohndel
Just link it directly into Subsurface-mobile. That's what we already do with the qmake file for iOS, now the cmake based builds do the same. This should remove a lot of issues. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-17scripts: run all scripts with -eGravatar Anton Lundin
Run all scripts with -e so they exit as soon as something breaks. That way the build stops at the first error, not some other error. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-17Android build: compile kirigamiGravatar Joakim Bygdell
Build kirkigami plugin out of source and make sure that we use the same QT version for the plugin and the app. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-16iOS build: no need to build kirigami library anymoreGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-16iOS build: directly include KirigamiGravatar Dirk Hohndel
Instead of building a library that we link against, let's just use the .pri file and include Kirigami in the primary build. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-15Remove hacks around Kirigami issuesGravatar Dirk Hohndel
Those were fixed upstream. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-14IOS build: compile kirigami pluginGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-14Use kirigami built in static modeGravatar Marco Martin
Now kirigami needs to be built with a C++ plugin. In cases of mobile operating systems such as iOS (and in a lesser measuse, Android) having a proper plugin loaded at runtime may be difficult, so statically link it together with all of its qml files compiled as a qresource inside the static library. Signed-off-by: Marco Martin <notmart@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-08-13Add new files to qmakeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>