mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-29 21:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
13898 commits 100 branches 97 tags 206 MiB
Commit graph

503 commits

Author SHA1 Message Date
Dirk Hohndel
b03c5a98d4 A few more updates to Copyright notices 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-30 08:25:13 -08:00
Dirk Hohndel
702ec37145 Android build: make androiddeployqt less verbose 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-26 12:32:33 -08:00
Dirk Hohndel
f4c1cef73b Android build: work around odd bug with cmake 3.10 
For some reason it suddenly cannot figure out which build program
to use. This seems like a weird hack, but works.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-26 09:27:02 -08:00
Dirk Hohndel
4346aaa333 Android build: no point making the docs 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-26 09:24:35 -08:00
Dirk Hohndel
5eec251be8 Travis: hack around Android build failuers 
For some reason accepting the licenses for the SDK appears to fail.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-24 13:50:59 -08:00
Dirk Hohndel
9df88f0145 Android build: reorder downloading Qt vs SDK 
Since it's the SDK where things are failing, doing it this way makes the
turnaround time of my attempts to fix this faster. And in the larger
scheme of things, the order is irrelevant.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-24 13:50:59 -08:00
Stefan Fuchs
a11622623a Remove unused divesitepicturemodel from qt-models 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2017-12-13 05:48:20 -08:00
Dirk Hohndel
03e14fa2c3 Cleanup: constructLocationTags isn't used in Subsurface-mobile 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-08 16:29:49 +01:00
Dirk Hohndel
ef8b2e6bb7 Cleanup: rename file to avoid confusion 
Depending on the tooling, both divesite.c and divesite.cpp would compile
into divesite.o.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-08 16:29:49 +01:00
Dirk Hohndel
7388a8120a Android build: fix android-build-wrapper.sh 
I clearly had forgotten to update the Android specific scripts when
adding the libdivecomputer submodule.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-06 20:47:20 -08:00
Dirk Hohndel
9434c36b7f Android build: build the libdivecomputer submodule 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-06 19:02:58 -08:00
Dirk Hohndel
14348a8d9a iOS build: next attempt to sort versions 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-06 06:46:10 -06:00
Dirk Hohndel
afc1847591 iOS build: more robust way to determine Qt version 
Suggested-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-05 20:05:16 -08:00
Dirk Hohndel
472592fe85 libdc: update MXE build 
If the submodule isn't initialized, run git submodule init before
running submodule update. Also, ensure that the autotools are set up.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-04 15:07:23 -08:00
Dirk Hohndel
ee0341fd97 Enable building BLE dive computers on iOS 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-04 13:54:07 -08:00
Dirk Hohndel
31641c19bf libdc: fix iOS build script 
Mis-counted directories and missed the submodule init call.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-04 12:53:43 -08:00
Dirk Hohndel
0ce44b8ed1 libdc: update the iOS build script for submodule 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-03 14:12:06 -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
Murillo Bernardes
f6d13374bd iOS: Enable location updates 
Add Info.plist entries to enable location updates even in background.

Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
 2017-12-03 08:19:00 -08:00
Dirk Hohndel
2c9beec775 iOS build: clean up the launch screen 
This contained left-overs from failed attempts to make it work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-02 12:30:54 -08:00
Dirk Hohndel
625298a7b8 iOS build: add icon to launch screen 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 22:32:03 -08:00
Dirk Hohndel
87e05f4db8 iOS build: add option to build.sh to only update version 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:53:11 -08:00
Dirk Hohndel
31c005fa06 iOS build: enable BLE support in the code 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:52:09 -08:00
Dirk Hohndel
16607a66c4 iOS buils: new Launch xib 
This still doesn't actually SHOW the logo...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:49:59 -08:00
Dirk Hohndel
38789f5a01 iOS build: add required explanation of BLE access permission 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:49:42 -08:00
Dirk Hohndel
c1bc77d086 iOS build: add iTunes artwork 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:49:01 -08:00
Dirk Hohndel
bca858a5d9 iOS build: call qmake in build.sh 
This way we can avoid having to use Qt Creator (in preparation for
eventually testing the iOS build in Travis CI).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 21:48:15 -08:00
Dirk Hohndel
18d044d9dc iOS build: update icons 
Latest xcode requires more and different(?) icons.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 14:56:39 -08:00
Dirk Hohndel
016b73872f iOS build: add a couple more imports to the build 
The build process uses the dummy.qml file to determine which QML modules
to package. This ensures that Subsurface-mobile includes all its
dependencies.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 14:56:39 -08:00
Dirk Hohndel
252fc94c67 iOS build: use libgit2 0.26.0 
Just like on all the other platforms.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 14:56:39 -08:00
Dirk Hohndel
6d5144451d iOS build: only use annotated tags for version 
This avoids picking the continuous tag.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-29 14:56:39 -08:00
Miika Turkia
8f16ae6289 Move Divinglog DB import into its own file 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-29 01:22:17 +01:00
Miika Turkia
c2342304db Move Cobalt DB import to its own file 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-29 01:22:17 +01:00
Miika Turkia
4325ae8d24 Move Shearwater DB import into its own file 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-29 01:22:17 +01:00
Miika Turkia
1a9484207b Move Suunto DB import into its own file 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-29 01:22:17 +01:00
Dirk Hohndel
a3754ecada iOS build fix 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-11-27 21:06:57 -08:00
Miika Turkia
1c6e189c2b Move Suunto DB imports into parse-db.c 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-27 13:42:10 -08:00
Miika Turkia
02c80a60b0 Refactore parse-xml.c into parse.c and parse-xml.c 
This should help us to move parsing that is not XML related to other
files, hopefully making the code cleaner.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-11-27 13:42:10 -08:00
Anton Lundin
c92a86f898 android: Don't re-clone subsurface in android-build-wrapper.sh 
Just use the source tree you where called from instead.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
65b825286c android: Correct path to Qt binaries 
Back in 6451adfec1, the path to the qt
binaries was changed. The current binaries are back on the old urls, so
this reverts half of 6451adfec1.

The other half is still true.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
9dd87bac03 android: Remove unneeded extra argument parsing 
This is handled by build.sh, which handles it correctly for running with
set -u.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
f3924aea29 android: Install android sdk on a different way 
This way we can auto-accept all the licenses.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
3f4f160552 android: Terminate build.sh on unknown arguments 
Previous code ended up in a eternal loop on unknown arguments.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
f9c85fa755 android: Ensure rm exits zero 
This is to comply with set -e

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
cfa241036c android: Remove unset variable VERSION 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
e87a9e1454 android: Increase BUILDNR with zero exit status 
This increases BUILDNR in a way that keeps exit status as zero, so the
script doesn't abort due to set -e.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
aa7208049f android: Allow Qt install in headless mode 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
 2017-11-16 10:23:00 -08:00
Anton Lundin
49d46255fd android: make android-build-wrapper.sh executable 2017-11-16 10:23:00 -08:00
Lubomir I. Ivanov
bd9dad7371 MXE: move the objcopy calls to cmakelists.txt 
The objcopy calls to strip the debug symbols out of
subsurface.exe need to happen before the installer is
created (staged).

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2017-11-15 12:28:51 +01: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
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
Miika Turkia
455559f5c5 Include qml-module-qtquick2 
Ubuntu and Debian require package qml-module-qtquick2 to be installed.

Fixes #720

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2017-10-22 19:36:02 -04:00
Dirk Hohndel
a68743ba15 Remove last hints of Marble 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-20 21:23:18 -04:00
Guillaume GARDET
3089a2d3a7 Update subsurfacedaily.spec to enhance debug 2017-10-20 14:25:09 -04:00
Guillaume GARDET
e01963ca02 Sync subsurfacedaily.spec with current OBS file 2017-10-20 14:25:09 -04:00
Dirk Hohndel
cbf5d788e0 Update Ubuntu/Debian packaging 
Part of this is based on code from Miika Turkia.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-16 04:54:53 -07:00
Dirk Hohndel
303e7c4982 iOS build: update dummy.qml to match all the imports 
I don't think we need all the versions, but it shouldn't hurt.
Now they are alphabetical, that should make it easier.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-14 07:47:03 -04:00
Dirk Hohndel
38243be44d iOS build: add include path for Kirigami 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-14 04:15:17 -07:00
Dirk Hohndel
f1baa575e6 iOS build: we don't use ssh and can't use OpenSSL 
On iOS we don't need to enable ssh-based git access - and we can
no longer build against OpenSSL (instead use the platform SSL libraries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-11 05:45:12 -07:00
Dirk Hohndel
37737c4381 Mac build: update the signing script 
Which admittedly is mostly useful for me...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-09 21:00:06 -07:00
Dirk Hohndel
e0cc9b9c4c Mac build: these problems have long been solved 
And the Readme is therefore confusing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-09 20:59:37 -07:00
Dirk Hohndel
3f75059a77 Add connectionlistmodel.cpp/h to iOS qmake file 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-10-07 10:06:47 -07:00
Stefan Fuchs
f0de9e77b8 Windows NSI installer: Remove qml folder on uninstall 
Do remove also the (new) qml folder on uninstall.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2017-09-24 22:20:23 +03:00
Miika Turkia
10216f5e3e Add required qml modules to Ubuntu packaging 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-09-23 00:59:14 -04:00
Dirk Hohndel
2d2bb95482 Mac packaging: add option to make bundle without creating DMG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-09-17 09:54:04 -07:00
Stefan Fuchs
803e98befe MXE build script: Mention googlemaps plugin in comments 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2017-09-15 08:58:19 -07:00
Stefan Fuchs
26d9944013 MXE build script: Remove hint to use old MXE version 
Meanwhile (after removing marble) it seems to be a good choice to use
latest MXE version with currently Qt 5.9.1.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2017-09-15 08:58:19 -07:00
Lubomir I. Ivanov
2b40e15713 remove Marble from packaging and build scripts 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>

---
please note, that i have no way to test most of the scripts ATM.
 2017-09-04 07:46:35 -07:00
Dirk Hohndel
0bb93c76fd Mac build: fix package creation 
libssh2.1 is a dependency of libgit2, not of the main executable.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-08-20 20:45:36 -07:00
Dirk Hohndel
e808c92bb6 MXE build: build the googlemaps plugin 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-08-02 23:07:47 -07:00
Lubomir I. Ivanov
e05abca7e0 mxe-based-build.sh: copy a googlemaps plugin instead of esri 
This would work only if the folder:
$BASEDIR/"$MXEDIR"/usr/i686-w64-mingw32.shared/qt5/plugins/geoservices
contains such a file.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2017-08-02 23:39:10 +03:00
Dirk Hohndel
ada477eda4 MXE build: don't use host cmake 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-08-01 02:53:17 -07:00
Dirk Hohndel
eb584db8ff Revert "MXE build: drop all WebKit dependencies" 
This reverts commit 916d4b8cce.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-31 09:40:11 -07:00
Dirk Hohndel
916d4b8cce MXE build: drop all WebKit dependencies 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 21:13:28 -07:00
Dirk Hohndel
04f8eee46c MXE build: copy the QML modules we need 
And include them in the installer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 20:43:26 -07:00
Dirk Hohndel
0021f24eef MXE build: better logical grouping 
This just makes more sense in which variables go with which code.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 13:41:35 -07:00
Dirk Hohndel
26879bffcc MXE build: include QtLocation DLL 
Another one that otherwise gets missed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 13:25:41 -07:00
Dirk Hohndel
4c0cac067c MXE build: install esri plugin 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 13:25:41 -07:00
Dirk Hohndel
ed8f8fba17 MXE build: remove Marble 
Also, don't package the data directory (which held marble data) anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 10:55:33 -07:00
Jan Mulder
3382f92843 Use same libgit2 on Android 
Just to be sure. Use the same version on Android build of libgit2
as used in the scripts/build.sh script.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-07-29 08:30:08 -07:00
Dirk Hohndel
7e52d11249 Mac build: adjust sign script 
Add QtLocation and QtQuickWidgets.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 08:18:41 -07:00
Dirk Hohndel
fcfa05b134 Mac bundle: no more Marble 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-29 07:55:25 -07:00
Dirk Hohndel
f940104a33 iOS build: add BLE support files 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-19 06:21:23 -07:00
Jan Mulder
5c7ac7e7d1 Android compile fix 
Forgotten slash broke my Andorid build (with Qt from source).

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-07-19 01:08:03 +09:00
Dirk Hohndel
9beb445d44 iOS build: update dummy file to include Controls 2 Material 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-17 20:32:04 -07:00
Dirk Hohndel
071e3f9933 iOS build: allow building against Qt 5.9.1 and later 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-17 16:49:02 -07:00
Dirk Hohndel
25cf741f70 iOS build: add bluetooth capability to Info.plist 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-17 14:26:02 -07:00
Alex Blasche
868fb9d5a9 Enable building with standard Qt install path layout 
In general this patch enables building of subsurface without being
forced to use the official Qt binary packages. This is particularly helpful
when having to debug Qt internals or having to deal with custom patches
on top of the official Qt releases.

The architecture dependent file path layout is only employed by official
Qt binary packages. They are the result of a reordering at package
generation time. If Qt was build for a single architecture, the standard
layout does not add the architecture specific top level patch for the resulting
binaries.

Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
 2017-07-06 12:43:11 +09:00
Alex Blasche
db8200a9c3 Remove obsolete QT5_ANDROID_BIN 
Signed-off-by: Alex Blasche <alexander.blasche@qt.io>
 2017-07-06 12:43:11 +09:00
Dirk Hohndel
40d85b5d63 Fix the failing bundle signature on Mac 
So THAT was why we had moved the plugins...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-03 22:36:39 -07:00
Robert C. Helling
bdd1a35c01 Add new sources to ios .pro file 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-07-04 06:12:09 +09:00
Dirk Hohndel
7a6cc12da2 Mac packaging - don't move Grantlee plugins 
I don't know why we moved them from the 5.0 subdirectory, but that
seems to break things now. Odd.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-03 13:30:10 -07:00
Dirk Hohndel
20254a43c0 Mac packaging: don't lose minimum version 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-04 03:56:51 +09:00
Dirk Hohndel
6bba524288 Mac package build: adjust handling of libgit2 
Apparently it now is a different dependency that causes problems.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-04 01:45:55 +09:00
Dirk Hohndel
9c0cc53175 Mac package build: remove obsolete hack 
And also add some additional comments.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-04 01:45:55 +09:00
Dirk Hohndel
339f128cdc MXE cross build: allow to specify mxe directory 
This should make it easier to test different mxe versions.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-07-02 18:56:18 -07:00
Dirk Hohndel
6451adfec1 Android build: switch to Qt 5.9.1 
It seems that the Qt team deviated from their previous practice to keep
the Qt/x.y directory structure the same for all minor releases - so now
it is indeed Qt/5.9.1
Oh well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-06-30 17:21:07 -07:00
Dirk Hohndel
ba2b5d8505 Add en_US translation for plurals 
This way in the en_US locale we no longer get shown the odd "dive(s)"
and instead get correct singular and plural forms.

Most of the patch is just a reindentation as it removes the if clause
that used to do the special case of NOT loading a translation for the
en_US case.

Right now we start with a trivial en_US translation file. My guess is
that this will be overwritten once we do the next round of "new strings,
new translations".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-06-22 04:19:23 -07:00
Dirk Hohndel
05435d64aa Android build: work around odd build problem with missing rand() 
I don't quite understand why this isn't correctly substituted to lrand48()
by the header file, but patching it in the source is easy enough.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-06-21 21:19:23 -07:00