Commit graph

225 commits

Author SHA1 Message Date
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
Dirk Hohndel
d4f6773b27 Travis: use the correct version in release announcement
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 21:56:31 -08:00
Dirk Hohndel
533098980a Travis: update the release message to mention Mac
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 21:41:42 -08:00
Dirk Hohndel
9c3a45af95 Travis: add Mac build
This adds a -skip-googlemaps option to the build script since for some
reason trying to build the googlemaps plugin in the Travis mac
environment causes an error with a missing stack-protector-strong
feature.

The build relies on a custom build Qt and a cached homebrew environment.
And the result is of course not a DMG with a signed app but a zip file
with an unsigned app - so it's a bit harder to consume.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 21:39:15 -08:00
Dirk Hohndel
65e65272ce Travis: set better release message
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 08:34:45 -08:00
Dirk Hohndel
de3d6b5327 Travis: make AppImages follow our naming pattern
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 08:34:45 -08:00
Lubomir I. Ivanov
8adcc82656 MXE: reword echo text about uploading
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-13 20:43:35 -08:00
Lubomir I. Ivanov
7552690afa MXE: experiment with creating a RelWithDebInfo build
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-11-13 20:43:35 -08:00
Dirk Hohndel
4d04f74312 Travis: also build an MXE/Windows installer
In the process, simplify our dependency a bit by no longer building
against libssh2 (we don't support ssh based authentication for git
on Windows) and libcurl (since it's proxy implementation doesn't appear
to actually work on Windows, anyway).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-11 17:48:57 -08:00
Dirk Hohndel
8da57b59f1 Travis: don't do a redundant upload to transfer.sh
uploadtool already takes care of that.

Reported-by: Simon Peter <probono@puredarwin.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-11 14:00:25 -08:00
Dirk Hohndel
35c5016777 Travis AppImage: don't delete the copyright info
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-11 08:12:54 -08:00
Dirk Hohndel
db64ec0af0 Travis: make sure git describe can work
Travis only fetches the last 50 commits - which means that git describe
will usually fail and our version numbers would end up being wrong.
So let's fetch the whole repo and the tags as well to make sure that
git describe works as expected by our tools.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 22:45:52 -08:00
Dirk Hohndel
07b773ff58 Travis AppImage: remove more files that aren't needed
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 22:24:03 -08:00
Dirk Hohndel
687d98e6a7 Travis: stop wget verbose output from flooding log
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 22:07:36 -08:00
Simon Peter
29350ceecd Travis: remove linuxdeployqt workaround
Do not move around .so* files in order for linuxdeployqt to pick them up.

Signed-off-by: Simon Peter <probono@puredarwin.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 10:55:01 -08:00
Dirk Hohndel
6dd6764b6b Travis: find googlemaps plugin at the new spot
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 10:55:01 -08:00
Dirk Hohndel
bee160a9e2 Travis: work around the way build.sh looks for private headers
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
b425d5641d Travis: use our own Qt binaries for AppImage build
This is no longer based on the upstream Qt binaries but completely on
binaries built by ourselves, trying to remove some of the features that
we don't need and trying to avoid some of the issues with certain
libraries (like different OpenSSL dependencies).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
01cea42705 Travis: move deployment into script
And no longer use the Travis deploy mechanism - uploadtool does it all.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
35d5d7c8c7 Travis: move the before_install step into a script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
96a3dd0001 Travis: start restructuring the build process
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
087900b643 Only considered annotated/signed tags for version
This works around confusion with the 'continuous' tag that we now use
for the CI AppImage builds.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-06 13:45:00 -08:00
Dirk Hohndel
8c98386732 build.sh: fix typo that caused us to build Grantlee tests
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 15:50:11 -08:00
Dirk Hohndel
6ce4239884 build.sh: add option to create appdir
This makes it easier to create an AppImage from the build artifacts.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 13:16:23 -08:00
Dirk Hohndel
138f0255f8 build.sh: always install Subsurface
We had not done this on Linux as it was just as easy to run from the build
environment, but we need to install in order to be able to create an AppImage
on Travis.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 13:15:53 -08:00
Stefan Fuchs
76286c4ece Rename README to README.md in some scripts, makefiles,...
Was needed after the file itself was renamed.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-11-04 10:55:11 -07:00
Robert C. Helling
43b1a73022 Check arguments of translation strings
Make sure the arguments of placeholders agree

Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-10-29 11:01:56 -07:00
Salvador Cuñat
15028fd299 smtk2ssrf-build.sh: add building command line mode
Add a flag to build with -DCOMMANDLINE=ON
2017-10-29 17:08:36 +01:00
Salvador Cuñat
d7d8434f4e sntk2ssrf-build.sh: minor fixes
- Reverse warning question logic.
- Remove marble related cmake flag.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-10-29 17:08:36 +01:00
Salvador Cuñat
1a0ea6cc97 smtk2ssrf-build.sh: Add warning and some style fixes
Add a warning about overriding subsurface binary and make some scripting
style changes.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-10-29 17:08:36 +01:00