Commit graph

74 commits

Author SHA1 Message Date
Dirk Hohndel
947b091553 Mobile: update version to 2.2.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21 15:13:10 -07:00
Anton Lundin
6f9c8ea1b7 Find Qt5WebKitWidgets path and use it
When building and installing Qt5WebKitWidgets to a different path than
your other qt libraries, you need to actually look for it and find it to
be able to use it.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
2019-09-11 17:21:50 +01:00
Dirk Hohndel
18c80d1cf0 Update Subsurface-mobile version number
The mobile changes are far and few, but the next version will be the
first to support arm64, so a new minor number seems appropriate.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-07-13 20:41:42 -07:00
Rolf Eike Beer
3b3306c552 CMake: clean up hints for finding libraries
HINTS should be dynamically introspected, static entries should be in PATHS.
There is also a platform dependent list of things where CMake always looks if
not explicitely forbidden, so remove any entries that are usually in those
default lists.

Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-21 19:30:14 -07:00
Rolf Eike Beer
c1f88ddd69 CMake: simplify code in HandleFindGit2
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-21 19:30:14 -07:00
Dirk Hohndel
643f4a5726 Remove partial support for QWebEngine
Printing never worked, none of this was ever included in test builds. Also, now
that there are official releases of QtWebKit again, this just doesn't seem worth
carrying along anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-03-20 08:45:02 -07:00
Dirk Hohndel
2b5d818d35 build-system: try to find libdivecomputer on LGTM
On LGTM we end up installing in /opt/out.

Also, fix a silly error in the existing code - don't look for libraries in
include directories.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-03-16 20:24:04 -07:00
Rolf Eike Beer
62c6a19744 CMake: get rid of QT_EXTRA_LIBRARIES
This can be easily derived from QT_EXTRA_COMPONENTS.

Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-09 09:51:55 -08:00
Dirk Hohndel
41ad8737a8 Update mobile version number
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-01-25 10:39:54 +13:00
Miika Turkia
5f32cc508f Add symlink for Documentation/mobile-images
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-11-18 06:33:27 +08:00
Dirk Hohndel
3e838ee74d Mobile: update version
Required to be able to push test builds to TestFlight.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-30 12:23:31 -07:00
Dirk Hohndel
b45124d554 Update mobile version number
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-23 17:59:27 -07:00
Dirk Hohndel
c1025fd37b Update mobile version
Apple app store rules prevent even testing a binary with the same version as one
that has been submitted for release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-19 08:03:15 -07:00
Dirk Hohndel
76c4fb3975 Update mobile version number
In order to release new test binaries for iOS we need to rev the version
number,

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-12 14:29:55 -07:00
Dirk Hohndel
86b02343a1 Bump Subsurface-mobile version
Otherwise the Apple app store doesn't let me upload new test binaries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03 14:58:00 -07:00
Dirk Hohndel
2ae3760303 Switch mobile version to 2.1.0 in preparation for next release
Apple typically forces a much more detailed review if the version number
changes. Let's get this taken care of now as we prepare for release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-18 15:06:04 +09:00
Jan Mulder
f9aa67a399 Build system: correctly find libdivecomputer includes
Fully unsure when this got broken, but we tried to find the
libdivecomputer includes based on the include file "hw.h".
Interestingly, that file does not exisist (any more?) in
libdivecomputer, so the search for the include fails. This
is annoying, as the initial cmake fails on this in case of
developer builds from QtCreator (which do not compile all
dependencies like our home grown build scripts).

The solution is simple: just find the includes for
libdivecomputer based on exiting files in this lib.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-20 14:29:47 +01:00
Jan Mulder
564b4cde5a mobile: bump to version 2.0.3
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-02-02 11:08:25 -08:00
Jan Mulder
a8c1f405f4 mobile: bump version to 2.0.2
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-12-29 09:11:19 -08:00
Dirk Hohndel
fa57bb46f2 Update Subsurface-mobile version number
Should have done that right after the release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-25 09:40:10 -08:00
Dirk Hohndel
d839392bb6 Mac build: don't force link against OpenSSL
libgit2 uses native SSL / crypto on Darwin/macOS.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-23 11:51:21 -04:00
Lubomir I. Ivanov
da3288590e remove Marble cmake modules
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2017-09-04 07:46:35 -07:00
Dirk Hohndel
016b19ef0c Subsurface-mobile version jump to 2.0
The beginning of download (plus the UI overhaul) definitely deserve
a major version bump.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-03 21:58:26 -07:00
Dirk Hohndel
096682cd94 Whitespace
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-03 13:48:54 -07:00
Dirk Hohndel
60123515b6 Fix '-L-lcurl' linker warning
This would happen if we don't have a specific directory in LIBSSH2_LIBRARY_DIRS.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-03 13:47:23 -07:00
Dirk Hohndel
f690a98228 Update Subsurface-mobile version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-05-12 14:08:23 -07:00
Dirk Hohndel
cdcbeea571 Update Subsurface-mobile version to 1.2.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-24 12:00:45 -07:00
Jeremie Guichard
e418bb7e28 Fix dlllist.cmake not to use hard coded path to link.txt
The utility could be used for other targets,
path should therefore depend on the inputted target parameter

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Jeremie Guichard
7b08f8d23c Move CMake variables printing into a utility macro
Added cmake_variables_helper.cmake providing 2 helpers
 - print_variable
 - print_all_variables

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Dirk Hohndel
affea807c8 Update Subsurface-mobile version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-21 15:59:04 -08:00
Dirk Hohndel
73641c4e73 build.sh: if new enough libgit2 is installed, use it
Right now this is only designed for Linux where current distros all should have
a new enough libgit2 (and our instructions tell people to install this with
system tools, so we should also use it).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-01-16 17:00:55 -08:00
Robert C. Helling
529a4d499b Start transition from QWebKit to QWebEngine
This removes all references to WebKit if cmake option USE_WEBKIT is enabled.
For the user manual it changes it to WebEngine (seems to work for me).

Similar for the Facebook connection (minus a reference to a cookie jar).
This I could not test at the moment, as I wrote this on a train.

Printing does not work, it is a null operation at the moment. Currently,
large parts of of the printing code are commented out as there is no direct
way to access page elements in WebEngine. It seems this needs to be done
via Javascript (with a callback invoked). There is new functionality in
WebEngine to render a view to a PDF file but this needs more work (and
probably some thoughts towards page breaks).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
2016-12-30 19:43:00 +01:00
Dirk Hohndel
1d8a77ef5c Bump mobile version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-17 12:59:46 -07:00
Dirk Hohndel
3affaedb38 Update Subsurface-mobile version to 1.1.0
Just so that the iOS release has a sane starting point - and frankly,
we've done a very poor job of maintaining this version number.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-04 09:53:24 -07:00
Dirk Hohndel
094ff8c681 QML UI: all these changes certainly deserve a new version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-01 23:05:28 -05:00
Dirk Hohndel
1b0c3d8df5 Update mobile version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-28 17:05:49 -05:00
Dirk Hohndel
b02b76aea0 Bump Subsurface-mobile version
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-13 18:24:29 -07:00
Dirk Hohndel
343e8e3df6 Another bump to the Subsurface-mobile version number
Hopefully this is the one we can release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-11 13:26:51 -08:00
Dirk Hohndel
26c2dea46c Bump Subsurface-mobile version
Even though 1.0.0 was never released publicly, it was offered to beta
testers, so it is good practice to bump the version number for the next
binary that I'll push to them. Even if the build number would of course be
different.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10 22:19:21 -08:00
Dirk Hohndel
6be0800704 Update Subsurface-mobile version to 1.0.0
And make sure the version displayed for Android includes both that version
and the build version, which is our regular canonical 4 part version
number - so this release will be something like "1.0.0 (4.5.2.1047)"

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-10 06:29:26 -08:00
Dirk Hohndel
1a54e42f3d Fix cmake for libssh2 1.7 and later
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-09 21:50:37 -08:00
Dirk Hohndel
d42b7f55c4 Introduce separate version number for Subsurface-mobile
This is hard coded in version.cmake for now. The intent is to go to 1.0 in
the first release version and to increment from there whenever we create
an update.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-05 17:00:14 -08:00
Tomaz Canabrava
c022f5c4f7 Force the creation of some soft-links
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08 08:04:31 -08:00
Dirk Hohndel
2882a1ef41 Remove the non-canonical Subusrface version
It no longer makes sense to lie about the version. If you are running a product
build, then the canonical version is the same version as the plain version used
to be. And in either case it makes much more sense to simply log the full
version information.

We used to have the differently styled versions for different OSs, but I don't
think this is needed anymore. Let's hope this doesn't go down as one of these
"famous last words" moments...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20 07:59:50 -08:00
Dirk Hohndel
dbe0d844f7 Trying to fix persistent build problems
This shouldn't hurt on any platform, but it may help on a couple of
platforms where it appears we are missing libcrypto on the link line.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19 22:04:20 -08:00
Dirk Hohndel
dd1c1359a1 Cmake: successfully create the subsurface.nsi file
More issues with the static cmake files. Again we were missing a variable
and needed less quoting. Additionally there was dead / redundant code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17 17:06:23 -08:00
Dirk Hohndel
c7278cd9ed Cmake: adjust dlllist.cmake to no longer be created on the fly
Because of this a bunch of variables need to be passed in and the quoting
changes in rather subtle ways.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17 15:59:15 -08:00
Dirk Hohndel
63290e3155 Cmake: fix variable name case confusion
I don't know why on one of my Macs (running El Capitan, XCode 7.2, cmake 3.4.1)
I get Libssh2_FOUND instead of LIBSSH2_FOUND, but this hack works around the
problem.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17 12:03:40 -08:00
Tomaz Canabrava
aa6d9f5ba0 Code cleanup
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17 10:14:19 -08:00
Tomaz Canabrava
bbc7cbdf75 Remove depreceated calls to -DLIBGIT23
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17 10:13:39 -08:00