subsurface.git/packaging, branch v4.9.3

Android: ensure higher build number for arm64 APK

2019-07-20T04:46:07Z

Google Play allows uploading two APKs, but only if the arm64 one has a higher build number. Signed-off-by: Dirk Hohndel

Android: small change to keep exports together

2019-07-18T13:39:00Z

Simply move that export to the top of the file with the others. Suggested-by: Anton Lundin Signed-off-by: Dirk Hohndel

Android: fix review comment

2019-07-18T13:39:00Z

Fix review comment by Anton on GitHub. Signed-off-by: Jan Mulder

Android: fix location of the build apks

2019-07-18T13:39:00Z

With all upgrading, the build apks now show up in a slightly different location. Correct this in the scripting. Notice that this is debug building only. Release building is outside the repo. Signed-off-by: Jan Mulder

Android: rework build of OpenSSL to get it to build link and run

2019-07-18T13:39:00Z

This is squashed commit consisting of a number of subjects, all intended to get our app to build, link and run on device, but as the steps are small (but non-trivial), I document them in this one commit. 1) Do not use OpenSSLs install targets, but simply copy the wanted build artifacts manually. The main reason for this, is that the install targets want to install a lot more than we build, so it also builds parts of the OpenSSL suite that we will never use. 2) As Android does not like shared libraries with embedded versioning (and the used androiddeployqt actively prevents adding versioned libraries to the build), strip all this data from the generated shared libraries. This trick was already there, but its adapted to all possible conflicts. 3) The OpenSSL config script seems rather broken, resulted in failed builds, and calling the underlying Configure is simpler. 4) Finally, parts of the OpenSSL code uses stdio things like stdout, stderr, etc. These showed up as undeclared external on build time. Well, luckily, there was an easy way out using 2 -D(efines). This feels hacky, but does the job (and we are not interested in the output of OpenSSL in our app). Signed-off-by: Jan Mulder

Android: Qt 5.12.4, OpenSSL 1.1.1c

2019-07-18T13:39:00Z

The main reason for upgrading of the Qt version is the hunt for a broken BT/BLE stack, preventing downloads from BT/BLE enabled DCs, in relation to arm64 architecture builds. (And the absolute need for an arm64 build in relation to the publication of the Android app in Googles Play store). In addition, Qt 5.12.4 starts supporting OpenSSL 1.1.1c, and trying to use our current OpenSSL 1.0 series is highly discouraged by Qt (and OpenSSL itself). So, upgrade both in unison. But ... be careful bisecting issues on this commit, as it does break our build. That will be fixed in the next commit. This fixes the BT/BLE download for arm64! Signed-off-by: Jan Mulder

Cleanup: move gas-functions to own translation unit

2019-06-19T20:11:10Z

But only functions that operate only on gases. Functions concerning cylinders or dives remain in dive.c or are moved to equipment.c Signed-off-by: Berthold Stoeger

Cleanup: move unit-related functions to own translation unit

2019-06-19T20:11:10Z

Create a units.c translation unit. Signed-off-by: Berthold Stoeger

Cleanup: move trip-related functions into own translation unit

2019-06-19T20:11:10Z

These functions were spread out over dive.c and divelist.c. Move them into their own file to make all this a bit less monolithic. Signed-off-by: Berthold Stoeger

Cleanup: move tag functions into own translation unit

2019-06-19T20:11:10Z

Make dive.h a bit slimmer. It's only a drop in the bucket - but at least when modifying tag functions not the *whole* application is rebuilt anymore. Signed-off-by: Berthold Stoeger