aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/android
AgeCommit message (Collapse)Author
2018-05-18build-system: added get-dep-lib to android/build.shGravatar jan Iversen
Integrated get-dep-lib in android/build.sh Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-17android-build: Remove old libgit2 special handlingGravatar Anton Lundin
And replace it with something that works on a modern cmake. The upside with using the right linker, we get the symbols resolved correctly so we don't need to regex the code. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Stop installing ant, we're using gradeGravatar Anton Lundin
Since about a year ago qt-android-cmake shifted to using gradle instead of ant, and the android sdk's stopped supporting ant to. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Simplify and correctGravatar Anton Lundin
This simplifies the code and uses correct quoting for variables. This also fixes the sha1-stampfile handling so that we don't build libdivecomputer every time. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Build googlemaps plugin same way as othersGravatar Anton Lundin
This reworks the googlemaps build to be more like the other builds, with the same pattern and way of detecting what we need to do, and when we need to rebuild it. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Use sed -i instead of home rolled variantGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Use subsurface source variableGravatar Anton Lundin
We already have a variable pointing to the source dir for subsurface, so use it. This way we can build out of tree, in any directory. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-04-27Android: fix error in build scriptGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-27Android: rebuild libdivecomputer if SHA changesGravatar Dirk Hohndel
Just like we already do for iOS. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-19Android build: switch to Qt 5.10.1Gravatar Dirk Hohndel
That's what we now use for the official binaries as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-19Android/iOS build: get libxml2 and libxslt from GitHubGravatar Dirk Hohndel
The xmlsoft.org links sometimes time out. Sadly, GitHub API gives us an oddly named top level directory in the tar file, so lets strip that and replace it with the "usual" name. Also, for the "raw" tar files from GitHub we need to run autoreconf ourselves. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-11android/build.sh: build the googlemaps pluginGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-02-24Android build: use Qt 5.9.3Gravatar Jan Mulder
At least, now the Travis builds use the same Qt version as the production builds from Dirk that go to the AppStores. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-26Android build: make androiddeployqt less verboseGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-26Android build: work around odd bug with cmake 3.10Gravatar Dirk Hohndel
For some reason it suddenly cannot figure out which build program to use. This seems like a weird hack, but works. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-26Android build: no point making the docsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-24Travis: hack around Android build failuersGravatar Dirk Hohndel
For some reason accepting the licenses for the SDK appears to fail. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-24Android build: reorder downloading Qt vs SDKGravatar Dirk Hohndel
Since it's the SDK where things are failing, doing it this way makes the turnaround time of my attempts to fix this faster. And in the larger scheme of things, the order is irrelevant. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-06Android build: fix android-build-wrapper.shGravatar Dirk Hohndel
I clearly had forgotten to update the Android specific scripts when adding the libdivecomputer submodule. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-06Android build: build the libdivecomputer submoduleGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-16android: Don't re-clone subsurface in android-build-wrapper.shGravatar Anton Lundin
Just use the source tree you where called from instead. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Correct path to Qt binariesGravatar Anton Lundin
Back in 6451adfec11262c3522878e700cb6794df8ee3d2, the path to the qt binaries was changed. The current binaries are back on the old urls, so this reverts half of 6451adfec11262c3522878e700cb6794df8ee3d2. The other half is still true. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unneeded extra argument parsingGravatar Anton Lundin
This is handled by build.sh, which handles it correctly for running with set -u. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Install android sdk on a different wayGravatar Anton Lundin
This way we can auto-accept all the licenses. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Terminate build.sh on unknown argumentsGravatar Anton Lundin
Previous code ended up in a eternal loop on unknown arguments. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Ensure rm exits zeroGravatar Anton Lundin
This is to comply with set -e Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Remove unset variable VERSIONGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Increase BUILDNR with zero exit statusGravatar Anton Lundin
This increases BUILDNR in a way that keeps exit status as zero, so the script doesn't abort due to set -e. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: Allow Qt install in headless modeGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16android: make android-build-wrapper.sh executableGravatar Anton Lundin
2017-09-04remove Marble from packaging and build scriptsGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> --- please note, that i have no way to test most of the scripts ATM.
2017-07-29Use same libgit2 on AndroidGravatar Jan Mulder
Just to be sure. Use the same version on Android build of libgit2 as used in the scripts/build.sh script. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-07-19Android compile fixGravatar Jan Mulder
Forgotten slash broke my Andorid build (with Qt from source). Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-07-06Enable building with standard Qt install path layoutGravatar Alex Blasche
In general this patch enables building of subsurface without being forced to use the official Qt binary packages. This is particularly helpful when having to debug Qt internals or having to deal with custom patches on top of the official Qt releases. The architecture dependent file path layout is only employed by official Qt binary packages. They are the result of a reordering at package generation time. If Qt was build for a single architecture, the standard layout does not add the architecture specific top level patch for the resulting binaries. Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
2017-07-06Remove obsolete QT5_ANDROID_BINGravatar Alex Blasche
Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
2017-06-30Android build: switch to Qt 5.9.1Gravatar Dirk Hohndel
It seems that the Qt team deviated from their previous practice to keep the Qt/x.y directory structure the same for all minor releases - so now it is indeed Qt/5.9.1 Oh well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Android build: work around odd build problem with missing rand()Gravatar Dirk Hohndel
I don't quite understand why this isn't correctly substituted to lrand48() by the header file, but patching it in the source is easy enough. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Android build: match versions between wrapper and build scriptGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-06-21Upgrade 3pp for android and testingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-05-31Android build script: use interactive SDK installGravatar Dirk Hohndel
And then manually fix the license as that doesn't appear to work correctly in the tool. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-31Android build script: update for Qt 5.9Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-27Update Android build scriptsGravatar Dirk Hohndel
- prepare for Qt 5.9 - remove references to ANT - adjust to changed location of the resulting apk Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-27Android build: Add BUILDTOOLS_REVISIONGravatar Jan Mulder
The used cmake toolkit for building the Android Subsurface-mobile app (qt-android-cmake) recently moved away from compiling with Ant in favor of Gradle. The most recent Android SDK will not support Ant any more. This calls for the addition of the Android SDK BUILDTOOLS_REVISION define to the cmake of Subsurface-mobile. Without this, the build will fail. The value has to be set to an existing directory in .../android-sdk/build-tools/ Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-04-16Change protocoll for any git clone from Github to httpsGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-20Android build: extend comment for Qt5.8Gravatar Jan Mulder
Just an update of comment. The stange issue with Qt5.7.1 is still present in Qt5.8. Extend the comment accordingly. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
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>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 18:22:33 +0000