summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-19Trying to fix persistent build problemsGravatar Dirk Hohndel
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-19Don't complain about missing GPS source unless mobileGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19QML-UI: allow toggling verbose mode from the UIGravatar Dirk Hohndel
Hidden in the Developer menu. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19QML-UI: more log message when retrieving web user idGravatar Dirk Hohndel
At least one tester cannot retrieve their web user id. This should help us collect more data and figure out why this fails. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19QML-UI: actually show the right text for missing cloud credentialsGravatar Dirk Hohndel
If we have no credentials or invalid credentials, update the text on the start page accordingly. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-18Switch the Android build.sh to set up mobile build correctlyGravatar Dirk Hohndel
We now need to set SUBSURFACE_TARGET_EXECUTABLE to MobileExecutable. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: successfully create the subsurface.nsi fileGravatar Dirk Hohndel
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-17Cmake: adjust dlllist.cmake to no longer be created on the flyGravatar Dirk Hohndel
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-17Cmake: fix variable name case confusionGravatar Dirk Hohndel
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-17Cmake: more use of SUBSURFACE_TARGET and more complete macdepoyqt argsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Cmake: consistently use SUBSURFACE_TARGET and get the capitalization rightGravatar Dirk Hohndel
Also clean up a bit of the whitespace mess right where I'm making changes Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Do not try to compile FTDI_EPROMGravatar Tomaz Canabrava
this was requiring libconfuse and we don't need it. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Use newer librariesGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Fix CMake to not add Facebook on AndroidGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Add the correct target on the Android buildGravatar Tomaz Canabrava
The android build could be the Desktop and the Mobile app, we cannot force it to be the mobile. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Add build* folders on gitignoreGravatar Tomaz Canabrava
Since we can build for more than one platform at the same time now, it's userful to block them on the gitignore to make sure we don't get a dirty tree just because we build for mobile and desktop inside the subsurface folder. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Build on android is a shared libraryGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Simplify IF for OSX handlingGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Code cleanupGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Remove depreceated calls to -DLIBGIT23Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-17Unselect source dive when saving a copy in replanGravatar Robert.Helling
Then the user can select the two copies and merge them as two different computers. Without this, the selection could is screwd up and there is no option to merge in the context menu. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix version generationGravatar Dirk Hohndel
In the cmake module we no longer had a way to get back to the main scripts directory. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: bring back the QtXml hack and other Mac changesGravatar Dirk Hohndel
The hack in commit c8be04edad5e ("Mac build: move the QtXml hack into Cmake") had been lost in the latest cmake rewrite. Similarly, the modified BUNDLE info and the manual QML deployment. Strangely this still doesn't correctly create a Subsurface-mobile.app on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: indentation fixGravatar Dirk Hohndel
I split this out as separate commit so that the previous commit becomes easier to read. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix installGravatar Dirk Hohndel
This had not been updated since the change of direction that we would support building Mobile and Desktop on all supported platforms. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: correctly read in the enabled translationsGravatar Dirk Hohndel
FILE READ doesn't do what we want. It's the STRINGS command that considers \n as whitespace and gets the correct result. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix QtQuick component designatorGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix another Mobile/Desktop confusionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix capitalization of MarbleGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: we only want libssrfmarblewidgetGravatar Dirk Hohndel
Let's not build against an unmodified Marble anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: correctly handle not finding MarbleGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Cmake: fix Application/Executable confusionGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Fixed cached variableGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Fix targets on mobile and desktopGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Fix some broken-by-design codeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Create targets MobileApplication and DesktopApplicationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove checking the Platform and the App Type,Gravatar Tomaz Canabrava
The check must be done, but not on the way I tried to do. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Complain if no Correct App version was passed to be buildGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Simplify MXE scriptGravatar Tomaz Canabrava
The MXE script still tried to run things using the qmake project file and we removed that ages ago. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Accept insourcesubdir buildsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Finish thingsGravatar Tomaz Canabrava
i hope Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Read the translations from the translations fileGravatar Tomaz Canabrava
instead of hardcoding everything on the main cmake Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move run on build dir code out of the main cmakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Rework the dependencies on the Android platformGravatar Tomaz Canabrava
We where able to build the android-mobile on desktop and the desktop on android, now I allow only mobile on android and desktop on desktop. this is to make the cmake clear, and we can also use the emulator on the android platform, so nothing is really lost. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move adding -lpthreadGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Change the way we handle targetsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16correct android usageGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Issue an error when no platform is foundGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Use a single variable to handle the extra Qt stuffGravatar Tomaz Canabrava
It's easier to debug what's wrong this way Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove commented out codeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-29 11:13:17 +0000