Commit graph

254 commits

Author SHA1 Message Date
Murillo Bernardes
d2d2e3af3d mobile: prevent Action buttons hijack after delete
This gets delete dive working properly.

Kirigami passive notification ends up hijacking area where the
"Add dive" or "Delete" or "Discard" buttons are shown. So after
deleting a dive the "Undo" button from the notification
keeps handling the touch events even when not visible.

Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
2018-05-13 07:03:15 -07:00
Cristian Ionescu-Idbohrn
aa96aa3ac3 Simplier way to get QT_VERSION
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-05-12 19:45:28 +03:00
Dirk Hohndel
387aee4cdf Mac: update build.sh to hack around autotools problem
For reasons I cannot explain, running configure for libdivecomputer claims that
certain feature tests pass, even though those features demonstrably aren't
there. This is happening for two compiler warning flags (-Wrestrict &
-Wno-unused-but-set-variable) as well as the test for clock_gettime.

To work around this, we manually edit the config.h file and the created
Makefile before building libdivecomputer.

This happened on macOS 10.11.6 with clang-800.0.42.1 (part of Xcode 8.2.1).

Tangentially related to:
See #1263

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-11 21:08:41 -07:00
jan Iversen
2408134014 Add script to download/clone 3rd party libs
Using one script instead of having the downloads in all build.sh ensures
consistency and lowers maintenance.

Note: this script is not intented to be run directly, it is intented to be
integrated in the various build.sh

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-11 10:44:55 -07:00
Dirk Hohndel
c67fe97ba1 Travis: remove flag for iOS that is no longer necessary
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-10 20:41:58 -07:00
Murillo Bernardes
7d6a48b59f iOS: use recommended variable for bundle ID
We used to hard-code the bundle ID which meant that developers always had to
manually override the bundle ID in order to be able to sign the iOS app for
local testing.  With this change, the official builds will continue to work
without manually opening the project in Xcode, yet other developers will use
the Apple-recommended format in order to set their own bundle ID.

This is based on a suggestion by Murillo Bernardes.

See #1246

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-10 08:19:33 -07:00
Robert C. Helling
3198b2e3ca Add a comment on building option -mobile
...to explain the difference between building the mobile
version to run on desktop and crossbuild for a mobile OS.

This should address #1247

Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-05-08 12:02:17 +02:00
Dirk Hohndel
450f0992a0 Travis: fix Android build by forcing Ubuntu:xenial for container
The build fails with newer versions and Ubuntu:latest switched to bionic
a few weeks ago.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-07 00:39:39 +02:00
Dirk Hohndel
2137b21e1b iOS: allow building for the simulator & switch debug/release builds
It makes sense to be able to control this with command line options.
On Travis this avoids the signing problem and makes the build much faster.
Still should be enough to catch iOS breakage.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-24 15:47:25 -07:00
Dirk Hohndel
c145911767 Travis: add iOS build
Disable most warnings for iOS test build as otherwise the Travis log file will
exceed 4MB and the build will fail.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-24 15:45:44 -07:00
Dirk Hohndel
96611c630f Travis: make qt55 build report build failures correctly
The proxy for this is a check to see if the Subsurface binary was
created (in which case we assume that the build succeeded).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-15 16:05:50 -07:00
Dirk Hohndel
24a798a5c3 QML UI: update to latest Kirigami
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-15 08:16:59 -07:00
Dirk Hohndel
d15a0bc277 Fix typos
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-13 17:07:42 -07:00
Dirk Hohndel
bca7f8ed61 Travis: test build against Qt 5.5
We do this in a docker environment to make things fast and easy.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-22 07:58:04 -07:00
Dirk Hohndel
c20faf907a Remove now obsolete script
With the removal of the transport tags from our libdivecomputer branch,
we can no longer automate the table creation that way.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-03-13 22:39:34 -07:00
Lubomir I. Ivanov
eac7c4bdae scrips/mobilecomponents.sh: fetch icon for the map
Use one of the breeze icons for the map in the drawer
on the mobile version.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2018-03-11 11:40:12 -07:00
Salvador Cuñat
36396d0bf4 smtk-import: Upload .AppImage and .exe files
Upload windows installer and AppImage to Subsurface's repo

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Salvador Cuñat
9ec6aafe51 smtk-import: Add an AppImage for smtk2ssrf
Build an AppImage for smtk2ssrf using previously build binaries.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Salvador Cuñat
f6cee2ca7e smtk-import: add windows building to travis-ci
Prepare the building script to suport travis or set other automated
builds, while keeping other options to manual builds.

In before_install script, create needed directories, and dowload
mdbtools sources.

Add smtk2ssrf build script to travisbuild.sh

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Salvador Cuñat
d303a589e6 smtk-import: fit build script to run in travis builds
Set an "automatic" mode via parameter (or auto detected if running in
travis environment) to skip the user prompt.
Install the built binary, in automated builds, under the usual
INSTALL_ROOT folder.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Salvador Cuñat
142c60ff88 smtk-import: Support SmartTrak import in travis builds
1.- Include needed dependencies (glib-2.0 and mdbtools) in .travis.yml
2.- Call smtk2ssrf-build.sh script *after* subsurface is done and
AppImage is built, as the script will override subsurface's binary.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Jan Mulder
cd0b911fe8 Mobile: new Kirigami SHA
And sync again with Kirigami master. All safe QML improvements.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-24 11:39:49 -08:00
Jan Mulder
36b8594cce Mobile: again new Kirigami SHA
While we are at this, just go to current master. Only QML
improvements, and safe to upgrade.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-17 21:05:33 +01:00
Jan Mulder
e507b123b5 Mobile: fix build after new Kirigami sha
This is definitely a hack.

Do not include the Kirigami resources (on static build). It causes
double defined symbols in our setting. I would like a nicer fix for this
issue, but failed to find one. For example, not adding the resource in
our build causes the qrc file not to be generated. Manual generation
of the resource file (using rcc) introduces the double symbols again.
so it seems some Kirigami weirdness (but their staticcmake example compiles
correctly).

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-15 21:23:28 +01:00
Jan Mulder
068d55b79d Mobile build: new Kirigami SHA
While most new commits are QML improvements, there is a change
in the Kirigami build related to static building (like we do),
and Cmake restyles to make things more Qt compliant.

As now the (generated) qrc_kirigami.cpp is included from
kirigamiplugin.cpp, for static builds, our build failes on
double defined symbols.

Following commit deals with this fail.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-15 21:23:28 +01:00
Jan Mulder
a5b44362c6 mobile: newer Kirigami SHA
This commit consists of the following 3 parts:
1. There are 2 source files added, adapt our build process
accordingly.
2. Due to a change in icon and kirigami QML prefixes, we need to
adapt for this as well. Changed mobile-resources.qrc for that.
When this would not be changed, the icons will not be found.
3. To further prepare for the future, abandon the iconName
property in favour of the new icon grouped property, which
can have more attributes than only the name. But currently
it is only a syntactic change.

Tested on Android device, and no visible changes.

Signedoff-by: Jan Mulder <jlmulder@xs4all.nl
2018-01-03 14:04:08 +01:00
Dirk Hohndel
a1cd2f2e7a Use our fork of uploadtool
And use the 'correct' URL to obtain the actual file.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-30 11:10:40 -08:00
Robert C. Helling
9d844801b9 Update download URL for libzip
Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-12-18 11:29:17 -08:00
Miika Turkia
9e165602c4 Add git submodule init to build script
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-12-14 08:54:53 -08:00
Dirk Hohndel
8f318c7e69 Travis: no longer test Subsurface-mobile without BT
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-05 19:29:59 -08:00
Jan Mulder
a3b66b429e build system: fix build of libdivecomputer
Trivial fix. Do not first cd to the ./src/subsurface directory, and then prepend
the subsurface directory to the path.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-03 19:05:41 -08:00
Dirk Hohndel
25041be08c libdc: update the MXE build script for submodule
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-03 14:12:06 -08:00
Dirk Hohndel
3368b89336 libdc: get the submodule for Travis CI / Windows MXE
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-03 14:12:06 -08:00
Dirk Hohndel
dd20c2004d libdc: add submodule support to build.sh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-03 14:12:06 -08:00
Dirk Hohndel
6b396c45bc Clone breeze icons from GitHub
anongit.kde.org appears to have problems.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-27 13:41:15 -08:00
Dirk Hohndel
79e3f69f48 Travis: Mac: enable googlemaps again
This should work now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 17:00:29 -08:00
Dirk Hohndel
775d27e5ff Travis: Mac build prevent error out when not using libcurl/libssh2
This shouldn't be needed anymore since the Homebrew libgit2 is not linked
against libcurl and libssh2.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
a240787c42 build.sh: remove googlemaps .qmake.conf hack
This needed to be fixed in googlemaps instead.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
ceb642fbdb build.sh: don't use sed -i
I can't seem to find a way to make this work on both Linux and Mac.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
ad4ea65493 Travis: try to make sure failing builds fail
In some situations Travis CI doesn't seem to notice that a build failed and
give us a green check mark even though the build didn't succeed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
82a1757e09 build.sh: only modify googlemaps .qmake.conf on Mac
This otherwise causes a failure on Linux builds.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Jan Mulder
8ed53ab5a6 mobile: new Kirigami SHA
Notice this is not the current master. Do not go there
right now. Kirigami SHA f8ee631aac787b60 introduces
a failing load of our main.qml (tested with both
Kirigami 2.0 and 2.2).

This SHA is safe.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-11-19 12:20:43 -08:00
Dirk Hohndel
f034121bef build.sh: fix comparison
This prevented googlemaps from building in some circumstances.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 08:10:37 -08:00
Dirk Hohndel
f691593e65 Switch back to upstream uploadtool
In commit e643589233 ("Travis: setup up the desired release message
right away") we temproarily switched to my fork of uploadtool to take
advantage of a new feature that I had implemented there. This has
already been merged upstream, so let's switch back to upstream.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 08:05:50 -08:00
Dirk Hohndel
e643589233 Travis: setup up the desired release message right away
Instead of using the default release message and then trying to fix it up
in the after_success section of one of the builds that we test, let's just
always use the message that we want, regardless which build finishes first.

This currently requires my fork of the uploadtool - the changes have been
submitted upstream and I hope they'll get merged there so we can switch
back to the upstream version of uploadtool.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 16:17:40 +01:00
Dirk Hohndel
cd9805904a Travis: include the symlink in the zip of Mac .app
Don't try to follow the (recursive) symlink.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 16:17:40 +01:00
Dirk Hohndel
46e1f5e36a Travis: update the release message
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-17 12:41:29 -08:00
Dirk Hohndel
9f1fde4794 Travis: don't edit Release info if this is a PR
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-17 12:21:13 -08:00
Anton Lundin
063aadd166 android: Add android build on travis-ci
This adds a android-apk-build which runs on travis-ci. This is using a
quite ugly trick, building in a docker container, basically just to get
a newer cmake. The cmake in trusty is way to old to work with android
builds.

A good side-effect is that this is a complete copy-paste for anyone who
would like to build android-binaries them self on Linux. All the
uglyness is hidden away in a docker container.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16 10:23:00 -08:00
Dirk Hohndel
f02388d6b7 Travis: test more variations of the build
On Linux we want to test both desktop and mobile, and both the full
feature set as well as a build without BT and without WebKit.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 22:18:10 -08:00