aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
AgeCommit message (Collapse)Author
2018-07-12ssrf: move functions from mobile-helper to mobile-mainGravatar jan Iversen
Move few mobile only functions from mobile-helper to mobile-main remove subsurface-mobile-helper file structure is now subsurface-*-main.cpp + subsurface-helper.cpp Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12Match openssl versionsGravatar Jocke
The versions for openSSL in variables.sh and get-dep-lib.sh needs to match or we end up recloning the repo on every build. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-12Add comment to variables.shGravatar Jocke
Add a comment to the variables.sh file so we don't forget to update qt version in the qt-installer-nontineractive file as well. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-09Travis: build Android against Qt 5.11.1Gravatar Dirk Hohndel
Instead of dealing with the challenges of downloading and installing the official package (which really prefers to be run interactively and frequently caused Travis failures) we get the pre-packed bits from our cache instead. Less data to transfer, quicker install. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09Android: update to use Qt5.11.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-07core: copy Display from SettingsObjectWrapper to qPref as its own classGravatar jan Iversen
copy Display from SettingsObjectWrapper to qPref as its own class file. Update Display to use a common load/sync scheme. Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name in struct preferences> - signal function have <name in struct preferences>_changed one class one .h/.cpp is the C++ idiom. Having load/sync of each variable in 1 functions (in contrast to the distributed way SettingsObjectWrapper handles it) secures the same storage name is used. Having the set/get/load/sync functions grouped together makes it easier to get an overview. REMARK: this commit are made to show the use of the low level LOADSYNC macros, which will be used for special cases. This class is NOT linked into the live system. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-06build-system/macOS: update the signing scriptGravatar Dirk Hohndel
This really isn't useful for anyone but me as I create official binaries. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: update make-package.sh to use macOS 10.11 as base versionGravatar Dirk Hohndel
Qt 5.11 no longer supports macOS 10.10. Also use the new long path to identify the SDK. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-04ShellcheckGravatar Joakim Bygdell
Code cleanup using shellcheck. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Update android build env.Gravatar Joakim Bygdell
Update the scripts used to build subsurface-mobile for andriod to use the variables file. Removed checks for obsolete Qt versions. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Add build variables fileGravatar Joakim Bygdell
This adds a file that contains the variables used in the android-build-wrapper and build scripts. This gives a single location for setting which versions of Qt, NDK and SDK we use when building the mobile app on linux. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-03iOS: find translations againGravatar Dirk Hohndel
commit ec0511e824 ("ios: concentrate build dirs") moved the translations around without updating the way they are accessed, causing our release 2.1.0 on iOS to not be localized. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03macOS: we don't need to bundle QtDBusGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03macOS: we no longer need libssh2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-04core: add qPref.h_and qPrefprivate.hGravatar jan Iversen
add 2 header files and 1 cpp file (qPrefPrivate does not have an implementation) The rewrite/consoliadation of SettingsObjectWrapper, qmlmanager, qmlpref and planner needs a place to put common private parts (qPrefPrivate) and 1 common class (qPref). Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-03build-system: tell Travis to wait longer for downloadsGravatar Dirk Hohndel
But simply ignore when building outside of Travis. Of course since we are building Android in a container, we need to first pass the environment variable to the container... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-25build-system: detect libdivecomputer changes in MXE buildGravatar Dirk Hohndel
Automatically trigger a rebuild of libdivecomputer if it has changed since the last build. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-22build-system: Only run autoreconf when neededGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-06-21mobile: remove MapWidget from mobile-resources.qrcGravatar jan Iversen
remove MapWidget entries from mobile-resources.qrc, and reference map-widget.qrc in Subsurface-mobile.pro for iOS Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-21mobile/ios: correct whitespaces to coding standardGravatar jan Iversen
correct whitespaces to coding standard in translations.qrc, qml.qrc and deployment.pri Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-15mobile: add qmlprefs classGravatar jan Iversen
add class to cmake and pro register class Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-11ios: add -all to build.shGravatar jan Iversen
-all will build debug and release for the choosen architectures armv7,arm64,x86_64 without extra parameter and only x86_64 with -simulator Use -all to prebuild all 6 variants we support. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09ios: concentrate build dirsGravatar jan Iversen
update build.sh to make all builds in build-ios to keep the git dir as clean as possible Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09ios: share clones with desktopGravatar jan Iversen
Change src dir for clones to subsurface/.. in order to share with desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09profile: make profile self containedGravatar jan Iversen
move qmlprofile.* to profile dir, to keep all parts of the widget in one place. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: decoupled ssrf.qrc and mobile.qrcGravatar jan Iversen
remove /subsurface.qrc from .pro copy missing mapwidget icon references to mobile-resources.pro Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-07iOS: move get-dep-lib outside ARCH loopGravatar jan Iversen
Fetch all 3rd party libs before entering ARCH loop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-04Cleanup: fold core/helpers.h into core/qthelper.hGravatar Berthold Stoeger
helpers.h included qthelper.h and all functions declared in helpers.h were defined in qthelper.h. Therefore fold the former into the latter, since the split seems completely arbitrary. While doing so, change the return-type of get_dc_nichname from "const QString" to "QString". Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-05-24iOS: updated launchscreen so it is more centered.Gravatar jan Iversen
The text and icon was so low, that the page started to scroll on an iPhone (at least on a model 6s). Anchored Text to top, and icon to text. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-21build-system: iOS only turn off specific warningsGravatar jan Iversen
Turning off all warnings (-w) was too radical. Only turning off specific warnings. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-20iOS: get rid of ios/Subsurface-mobileGravatar jan Iversen
Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20iOS: remove duplicate of deployment.priGravatar jan Iversen
one deployment.pri is enough Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-19Mac: don't try to copy libraries we got from HomebrewGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-19iOS, supress warnings.Gravatar jan Iversen
Changed .pro file to supress warnings clang does not allow all of the issued warnings to be supressed with -Wno-foo, so instead doing -w Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-19iOS, remove linker warnings (version mismatch).Gravatar jan Iversen
The Qt libraries are compiled as iOS 10.0, we link as iOS 8.0, this is a problem waiting to happen. First time we use a Qt function that uses a iOS 10.0 specific function the app will crash. Bumping iOS minimum version from 8.0 to 10.0 Removing the 76x icon, which are not valid from 10.0 and forward Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-18build-system: added get-dep-lib to android/build.shGravatar jan Iversen
Integrated get-dep-lib in android/build.sh Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-17iOS: added get-dep-lib to build.shGravatar jan Iversen
Removed all 3rd party download/clone, and used common get-dep-lib instead Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-17android-build: Remove old libgit2 special handlingGravatar Anton Lundin
And replace it with something that works on a modern cmake. The upside with using the right linker, we get the symbols resolved correctly so we don't need to regex the code. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Stop installing ant, we're using gradeGravatar Anton Lundin
Since about a year ago qt-android-cmake shifted to using gradle instead of ant, and the android sdk's stopped supporting ant to. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Simplify and correctGravatar Anton Lundin
This simplifies the code and uses correct quoting for variables. This also fixes the sha1-stampfile handling so that we don't build libdivecomputer every time. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Build googlemaps plugin same way as othersGravatar Anton Lundin
This reworks the googlemaps build to be more like the other builds, with the same pattern and way of detecting what we need to do, and when we need to rebuild it. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Use sed -i instead of home rolled variantGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17android-build: Use subsurface source variableGravatar Anton Lundin
We already have a variable pointing to the source dir for subsurface, so use it. This way we can build out of tree, in any directory. Signed-off-by: Anton Lundin <glance@acc.umu.se>
2018-05-17iOS, update Info.plist.in noteGravatar jan Iversen
Info.plist is no longer generated by qmake but by build.sh, and it is more interesting to highlight the fact that it is open software Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-11iOS: update weigth... weight to avoid warningGravatar jan Iversen
Seems the pro file was forgotten with the rename of weightsysteminfomodel.h Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-11iOS: corrected ^space to tabGravatar jan Iversen
Corrected to use correct code style. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-10WhitespaceGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-10iOS: cleaned/bumped versionsGravatar jan Iversen
Made versioning identical to scripts/build.sh Having the same version of 3rd party libraries across platforms secures a more stable product. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-10iOS: removed local build of libxml2Gravatar jan Iversen
script/build.sh uses the builtin libxml2 and do not build locally, updated build.sh and Subsurface-mobile.pro to to the same. sadly enough xslt is not distributed for iOS so it must be built. Apart from simplifying the script it saves build time Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-10iOS: removed local build of sqllite3Gravatar jan Iversen
script/build.sh uses the builtin sqllite3 and do not build locally, updated build.sh and Subsurface-mobile.pro to to the same. Apart from simplifying the script it saves build time Signed-off-by: Jan Iversen <jani@apache.org>