| Age | Commit message (Collapse) | Author |
|---|
|
This indents the code that is only executed when we aren't in 'quick'
mode. git show -w will show that there is no code change in this commit.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This allows us to skip all the checking / building of dependency
libraries. This also allows us to pass extra arguments to the make
command by separating them from the arguments to build.sh with '--'.
This commit is easier to understand because it didn't increase the
indent in the large block of code that is now only executed if we aren't
in 'quick' mode. That will be fixed in the next commit that is
whitespace only.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
This tells androiddeployqt to look at the qml modules to find all
dependencies.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Small hacks needed, but otherwise this seems to work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Switching to GitHub as source for libzip means that we need to encode
the version number differently. Newer versions of libzip don't compile
cleanly on Android and this one seems new enough.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
The versions for openSSL in variables.sh and get-dep-lib.sh needs to match or we end up recloning the repo on every build.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Add a comment to the variables.sh file so we don't forget to update
qt version in the qt-installer-nontineractive file as well.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Instead of dealing with the challenges of downloading and installing the
official package (which really prefers to be run interactively and
frequently caused Travis failures) we get the pre-packed bits from our
cache instead. Less data to transfer, quicker install.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Code cleanup using shellcheck.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
Update the scripts used to build subsurface-mobile for
andriod to use the variables file.
Removed checks for obsolete Qt versions.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
This adds a file that contains the variables used in
the android-build-wrapper and build scripts.
This gives a single location for setting which versions
of Qt, NDK and SDK we use when building the mobile app on linux.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
|
|
But simply ignore when building outside of Travis.
Of course since we are building Android in a container, we need to first pass
the environment variable to the container...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
Integrated get-dep-lib in android/build.sh
Signed-off-by: Jan Iversen <jani@apache.org>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
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>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Just like we already do for iOS.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
That's what we now use for the official binaries as well.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
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>
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
|
|
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>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
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>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
For some reason accepting the licenses for the SDK appears to fail.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
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>
|
|
I clearly had forgotten to update the Android specific scripts when
adding the libdivecomputer submodule.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
|
|
Just use the source tree you where called from instead.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
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>
|
|
This is handled by build.sh, which handles it correctly for running with
set -u.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
This way we can auto-accept all the licenses.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
Previous code ended up in a eternal loop on unknown arguments.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
This is to comply with set -e
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
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>
|
|
Signed-off-by: Anton Lundin <glance@acc.umu.se>
|
|
|
|
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
please note, that i have no way to test most of the scripts ATM.
|
|
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>
|
|
Forgotten slash broke my Andorid build (with Qt from source).
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
|
|
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>
|
|
Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
|
|
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>
|
Dirk Hohndel
Jocke
Anton Lundin
jan Iversen
Lubomir I. Ivanov
Jan Mulder
Alex Blasche