aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
AgeCommit message (Collapse)Author
2016-03-16Replace ~ by $HOME in build.shGravatar Robert C. Helling
Somehow the file test with ~ interpolation does not work Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-03Build scripts: work with both Qt 5.5 and 5.6Gravatar Dirk Hohndel
This is all a bit hackish but seems to work Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-02-02Simplify building of Android build from one source treeGravatar Jan Mulder
Currently, when running the packaging/android/build.sh from a source tree that has been used for desktop builds, libdivecomputer wants a make distclean. This is inconvinient, and is caused by building libdivecomputer in source. Now, configure and build libdivecomputer in a new subdirectory, allowing to run the android build script from the same source tree as the desktop (both desktop and mobile) builds. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-22build.sh: fix logic when to build grantleeGravatar Dirk Hohndel
Grmbl. SUBSURFACE_EXECUTABLE now doesn't get set until later in the script. So let's just trigger this explicitly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-18build.sh: fix broken logic to pull mobile componentsGravatar Dirk Hohndel
In commit f28f03afe2 ("build.sh: make it easier to build Subsurface-mobile") I mistakenly broke the logic that decides to run the mobilecomponents.sh script. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-17build.sh: make it easier to build Subsurface-mobileGravatar Dirk Hohndel
The script now takes a -mobile argument, or -both and then builds the mobile version or both versions. To make things more consistent across different invocations the desktop version is built in the "build" directory and the mobile version is built in "build-mobile". Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-17Make default build for desktop.Gravatar Willem Ferguson
Make the default build a DesktopExecutable, with an option to set a variable for doing a mobile build. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-12dive details navigationGravatar Sebastian Kügler
This patch reworks the navigation of the dive details. - The detailsview is now a list view with page-sized delegates. This allows horizontal swiping to the next and previous dive. - The central button now allows to open the edit mode for the dive. Original patch was done by Marco Martin, but needed to be reapplied by hand. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2016-01-08QML UI: add second action to GPS list entriesGravatar Dirk Hohndel
This one will allow people to see the location on a map. Also not implemented, yet. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08QML UI: better icon for deleteGravatar Dirk Hohndel
The cancel picture was odd - the trash can is much more typical. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08QML UI: support sliding action to allow the user to delete GPS fixesGravatar Dirk Hohndel
This is just the UI, the actual deletion is not yet implemented. I really like this interaction with the list items. Slide them to the left and you see icons for actions. Right now we have just one and that may seem like overkill (hey, we could just have the delete icon instead of the application menu icon, right?) but once we allow the ability to show the GPS location on a map we'll have two operations and this will make more sense. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08Consolidate scriptsGravatar Dirk Hohndel
Since commit c496d5fa05a9 ("Add helper script to pull Plasma Mobile Components and icons") we had three different spots where we retrieved the Plasma Mobile Components. That's a wee bit of overkill. So instead have the other two scripts just call this one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-08Add helper script to pull Plasma Mobile Components and iconsGravatar Dirk Hohndel
Normally this is done in the build.sh script when building Subsurface-mobile - but some people might have set up their build enviroment differently and for them this allows to pull (and update) these components from upstream without having to run build.sh Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07build.sh: don't build Grantlee for Subsurface-mobileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-07Remove plasma mobile components, pull from upstream at build timeGravatar Dirk Hohndel
This prevents us from constantly having to worry about keeping them in sync. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15Remove support for older libgit2 - we now require 0.23 or laterGravatar Dirk Hohndel
Also fixes a capitalization error that prevented finding libssh2 in some circumstances. And adds a missing include when building with libzip on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-09build.sh: don't build libssh2 anymore on MacGravatar Dirk Hohndel
I don't recall why this was needed, but things seem to work fine with the one avaialable via Homebrew Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-24CGI script wrapper for smtk2ssrf.plGravatar Robert C. Helling
This script should go to the cgi-bin directory of the webserver to proivide conversion of SmarTrack files as a web service. Paths need to be adopted and more html to make it more beautiful should be added. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-19Add perl function indent_ctor_init_lists to whitespace.plGravatar K. \"pestophagous\" Heller
whitespace.pl can now do a better job (although surely still not 100% perfect job) of formatting constructor member initialization lists according to the rules described in the current CodingStyle file. Signed-off-by: K. Heller <pestophagous@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-18A perl script to check format strings in translationsGravatar Robert C. Helling
This script can be called on translations files, e.g. > scripts/checktranslation.pl translations/*ts and will report if the number of % signs in source and translation differ. It finds quite a few issues that need to be investigated. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-09-06Build script: make sure we find the cmake files for our librariesGravatar Dirk Hohndel
This way cmake should pick the right libraries that we built earlier in the process. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-09-05Fix perl warning in whitespce.plGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-09-02Build script: small updates around installation on LinuxGravatar Dirk Hohndel
Don't install by default (and don't configure Subsurface to install into install-root). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-27Fix build scriptGravatar Dirk Hohndel
A git pull seems to cause things to go wrong. Just fetching the repository and checking out the version that we want seems to work better. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-26Update INSTALL and build.shGravatar Dirk Hohndel
They now reference the Subsurface-branch branches of Marble and libdivecomputer and v0.23.1 of libgit2. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-16Build script: fix install_name for libssrfmarblewidget on MacGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-16Build script: make sure cmake finds Qt on MacGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-08-16Build script: make sure we find any library that we installedGravatar Dirk Hohndel
Somehow libssh2 wasn't found on Mac builds - this makes sure we always add the $INSTALL_ROOT/lib as library path. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Use git pull with rebase in build scriptGravatar Henrik Brautaset Aronsen
Without rebase, the build script would stop because it couldn't complete a merge. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Build script: use mirror on our git serverGravatar Dirk Hohndel
gitorious is going away and the project doesn't appear to have migrated anywhere, yet. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-09Build script: switch to working URL for grantleeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04Build script: fix several bugsGravatar Dirk Hohndel
With this I can now successfully run this on Mac and Arch Linux, both running "fresh" and running in an existing build directory (i.e., getting the updates right). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04Build script: Integrate Grantlee & build Subsurface with printingGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-04Build script: make sure the versions we want to build existGravatar Dirk Hohndel
The script didn't do the right thing if it had been run before and was re-run to create the latest build. We need to actually pull the latest versions of the different git repositories and make sure that the branches and commits that we want exist. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-06-02Build script: remove Subsurface.app before building on MacGravatar Dirk Hohndel (Intel)
The make install step otherwise will give some odd warnings as it tries to adjust things from build to deploy. Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
2015-06-02Build script: use Subsurface-testing branches of marble and libdivecomputerGravatar Dirk Hohndel (Intel)
While in a release we'd want to use the corresponding release branches, it seems to make more sense to me to switch to the testing branches for Subsurface master. Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
2015-06-02Build script: build libssh on MacGravatar Dirk Hohndel (Intel)
Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
2015-06-02Build script: create log file by defaultGravatar Dirk Hohndel (Intel)
Signed-off-by: Dirk Hohndel (Intel) <dhohndel@dhohndel-mac02.jf.intel.com>
2015-06-01Build script: use sufficiently new libgit2 and enable cloud storageGravatar Dirk Hohndel
Turns out that as of a day ago or so tip of libgit2 master appears broken (the in memory ssh key test in the cmake file fails). But the specific commit that I'm picking here appears to work and is also new enough that https and ssh based cloud storage works. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-27Set the shared library file extenstion for the specific platform.Gravatar Jan Mulder
The shared library extension differs on MacOS. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-26Do not call install_name_tool for Marble libraryGravatar Tomaz Canabrava
Here on my Mac I had an issue that took a long time to understand. The build.sh script was correctly creating Marble but did not correctly run otool on it. So I fixed this by fixing CMake for the marble library which means we don't need to worry about it in the build script anymore. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-26Always reconfigure libdivecomputerGravatar Tomaz Canabrava
After doing a make clean / make confclean the makefiles were erased and running the configure script again didn't created the makefile. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-26Don't deppend on CMake to find the right libraries.Gravatar Tomaz Canabrava
We are compilling those libraries and we know where they are, so pass the directories and the libraries in a go directly. CMake was a bit random when choosing the correct ones, this way we are sure we got them. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-15build.sh: successfully build an App bundle on the MacGravatar Dirk Hohndel
Some install name magic on two of the libraries we build was necessary for things to work out correctly. And I added an install step to the default build that puts Subsurface in the install_root on other OSs and creates the Subsurface.app under subsurface/build/Subsurface.app on the Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-09build.sh: use "install-root" for our local install destinationGravatar Dirk Hohndel
This seems less confusing then calling it just "install". Also adjust our cmake/Modules/Find... files accordingly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-08When building from tar file, check .gitversion to get the correct versionGravatar Dirk Hohndel
Distribution builds on Linux tend to be made from tar files, not from git trees. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07There's no need to search for a qmake anymoreGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-07Small changes to the build-scriptGravatar Tomaz Canabrava
- libgits version bump to 0.22 (0.21.5 didn't worked here) - call cmake in build.sh instead of qmake. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19Merge branch 'v4.4-branch' back into masterGravatar Dirk Hohndel
The manuals all will need a careful read. The changes to use lsb-release and the PCLinuxOS specific files got lost because I didn't want to try to rewite this in the middle of a merge. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Conflicts: Documentation/50-pot/subsurface-manual.pot Documentation/fr/po/subsurface-manual.fr.po Documentation/user-manual.txt Documentation/user-manual_es.txt Documentation/user-manual_fr.html.git Documentation/user-manual_fr.txt Documentation/user-manual_ru.html.git Documentation/user-manual_ru.txt file.c qthelper.cpp subsurface.pro subsurfacesysinfo.cpp xslt/DiveLog.xslt
2015-02-17build.sh: use setRpath and remove run.shGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-29 17:01:30 +0000