aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-26QML-UI: attempt to improve profile scalingGravatar Dirk Hohndel
This still doesn't address all the issues, but appears to be a step forward. It also contains some debug output to better understand what's going on. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-25Android build: use better sed syntaxGravatar Dirk Hohndel
There is no reason to use '!' as separator and in some shell environments this can cause problems. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-24QML-UI: fix black squares on some Android devicesGravatar Dirk Hohndel
It appears that one some Android devices there is an interaction between Qt and the GL implementation that results in black squares instead of icons being shown on the screen. Disabling the GammaAdjust avoids running the shader and fixes this problem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-24Android build: more tweakingGravatar Dirk Hohndel
Don't ever link against a shared libcrypt. One of the recent changes to make things build on the various Linux build systems apparently broke the Android build as it now adds an extra -lcrypt right after the correct static link to libcrypt.a. Instead of fiddling even more with this and re-breaking all the other builds I just hack around it here and remove any calls to a simply -lcrypt as that won't work on Android. This also passes through the remaining options on the command line to make so we can do things like VERBOSE=1 or -j12 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-24Android build: allow selecting Debug / Release buildGravatar Dirk Hohndel
And never build the tests. Makes no sense to do so when cross building for Android. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-21Cmake: don't add the BT_SUPPORT define too earlyGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: more progressGravatar Dirk Hohndel
Most of the dependencies build now. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: only build the parts of openssl that we needGravatar Dirk Hohndel
No point in creating the apps, etc. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: make it possible to compile opensslGravatar Tomaz Canabrava
It compiles but the link stage fails because of a missing -LSystem but its a baby step. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: baby stepsGravatar Dirk Hohndel
Get a couple more dependencies built. These were easy. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: hack to build and install libsqlite3.aGravatar Dirk Hohndel
Building the iOS command line utility fails. But frankly, we don't need that, anyway. I cannot figure out how to tell sqlite that all I want is the library, so I'm working around that by first building the library, then pretending that sqlite3 was indeed built in order to be able to run make install. Horrible, ugly, stupid. But it seems to work. Also cleaned up the whitespace. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: make the README a bit more usefulGravatar Dirk Hohndel
Still not all that useful, though. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20iOS build: fix typo in CFLAGS argumentGravatar Dirk Hohndel
This way the gethostuuid workaround actually works. It still doesn't compile, though. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20Rework the env - variables to produce a working cross compile scriptGravatar Tomaz Canabrava
The cross compile script kind of works right now, it's missing something that I'm really not sure where or what it is. currently sqlite will not build because: error: gethostuuid is not defined in iOS This bug was already opened on sqlite bugtracker for about a year, the workaround is to pass -DDSQLITE_ENABLE_LOCKING_STYLE=0 to the compilation flags, which I did but did not work for some reason. Which is a good error - it shows us that we are actually trying to compile for iOS. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20Start the iOS cross compileGravatar Tomaz Canabrava
The build.sh and readme files are the same as the Android ones and I'll be changing them over time. The configure-for-ios.sh script is a file that manages to set everything, compilers frameworks and such, for iOS compilation. I'll probably dissecate the configure-for-ios.sh file and put it back on the build.sh, but not now. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20QML-UI: log the full version at startGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-20Remove the non-canonical Subusrface versionGravatar Dirk Hohndel
It no longer makes sense to lie about the version. If you are running a product build, then the canonical version is the same version as the plain version used to be. And in either case it makes much more sense to simply log the full version information. We used to have the differently styled versions for different OSs, but I don't think this is needed anymore. Let's hope this doesn't go down as one of these "famous last words" moments... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-19Cmake: don't use wildcards when deleting debug componentsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>