subsurface.git/packaging/android, branch v4.8.2forked from https://github.com/subsurface/subsurfacehttps://git.tsegers.com/subsurface.git/atom?h=v4.8.22018-08-06T03:39:27ZAndroid: whitespace change to build.sh2018-08-06T03:39:27ZDirk Hohndeldirk@hohndel.org2018-08-06T03:14:43Zurn:sha1:289e1cc37e5d91ef65b9a212ce6a0eb84a97fc77
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>
Android: add -quick flag to build.sh2018-08-06T03:39:21ZDirk Hohndeldirk@hohndel.org2018-08-06T03:12:16Zurn:sha1:35ffd5f71ee21d9f69103a1eaf1d6cef3faa1941
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>
Android: use our fork of qt-android-cmake2018-08-05T22:09:44ZDirk Hohndeldirk@hohndel.org2018-08-05T22:09:44Zurn:sha1:81ca29e688d941cb02a350201d0ad7481b816aee
This tells androiddeployqt to look at the qml modules to find all
dependencies.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: build latest libzip2018-08-05T22:08:19ZDirk Hohndeldirk@hohndel.org2018-08-05T22:07:46Zurn:sha1:32a630ece3b4612ef1b8a76d6cabbe8991e85025
Small hacks needed, but otherwise this seems to work.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Android: build libzip 1.1.32018-08-04T21:32:16ZDirk Hohndeldirk@hohndel.org2018-08-04T21:30:42Zurn:sha1:93983b7e4c0ad72c61c98a87132c6274b4640c16
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>
Match openssl versions2018-07-12T14:58:08ZJockej.bygdell@gmail.com2018-07-12T08:17:48Zurn:sha1:8106e533ef38f406cd5ef248c8735f3dfb962ee7
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 comment to variables.sh2018-07-12T14:58:08ZJockej.bygdell@gmail.com2018-07-12T05:11:18Zurn:sha1:2fa7d3566b7d4abe24925d465db664e32d14339a
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>Travis: build Android against Qt 5.11.12018-07-10T05:20:18ZDirk Hohndeldirk@hohndel.org2018-07-10T05:07:03Zurn:sha1:dc2f0f8e48e12dbf60639df15dcf1ea5069d2db8
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>
Android: update to use Qt5.11.12018-07-09T23:01:29ZDirk Hohndeldirk@hohndel.org2018-07-09T23:01:29Zurn:sha1:c62ce43ecf8d2c72d6acaa5e1727c8d31c6e30a0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Shellcheck2018-07-04T20:11:21ZJoakim Bygdellj.bygdell@gmail.com2018-07-04T05:51:59Zurn:sha1:5fc2e0f80f68acf2b54e34dd0d8950ea34ac0a98
Code cleanup using shellcheck.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>