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

415 commits

Author SHA1 Message Date
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