Commit graph

46 commits

Author SHA1 Message Date
Dirk Hohndel
25467aa85a Update the INSTALL file to reflect the switch to cmake
The cross building instructions for Windows are still lacking.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-09 15:50:11 -07:00
Claudiu Olteanu
d3d3cd9e35 Update the documentation with dependencies for cross-building on Linux to Windows
Update the documentation with dependencies for cross-building on Linux
to Windows for OpenSuse platform and correct some building instructions.
Moreover fix the windows building script to use the architectural specific
binary.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-17 13:59:59 -07:00
Dirk Hohndel
25d2f187e0 INSTALL: remove the detailed install instructions
It's much easier to just keep the build.sh script working and ask people
to use that instead of all the confusion with the detailed instructions.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 00:17:02 -08:00
Dirk Hohndel
56e1b11c0a Add instructions for building Subsurface under PCLinuxOS
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 00:16:52 -08:00
Dirk Hohndel
86274b603e build.sh: use setRpath and remove run.sh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 23:07:53 -08:00
Dirk Hohndel
b71cd66cd2 Document the new scripts in the INSTALL file
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 13:20:08 -08:00
Lubomir I. Ivanov
55898c07ff INSTALL: remove the native win32 build notes
Outdated and should not be maintained as there are
many levels of complications.

The NOT RECOMMENDED note should suffice.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:50:33 -08:00
Dirk Hohndel
06e2dde508 Get ready for Subsurface 4.4
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-04 07:54:44 -08:00
Dirk Hohndel
baa4b4d7c5 Don't show the plot_info table in every debug build
Instead add a new define SHOW_PLOT_INFO_TABLE that triggers if this
debugging aid is shown.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-02 13:14:04 -08:00
Dirk Hohndel
0416544d82 Update README, ReleaseNotes and INSTALL
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-01 07:20:47 -08:00
Dirk Hohndel
ac2c15e8cf Small adjustment to the Mac build instructions
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-10 16:58:08 -08:00
Dirk Hohndel
74bf5fc2b8 Fix typo in INSTALL file
Thanks Benjamin for catching this.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-31 08:20:44 -08:00
Dirk Hohndel
37b8257e09 Update INSTALL file to be more specific about libdivecomputer branches
Current master doesn't build with the Subsurface-4.3 branch of
libdivecomputer. You do need the Subsurface-testing branch.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-30 06:57:47 -08:00
Cristian Ionescu-Idbohrn
a0d36e2061 Add missing qt5-qmake package
See 'Build-Depends:' in packaging/ubuntu/debian/control.

Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-27 09:13:40 -08:00
Robert C. Helling
ac72bcfa00 Updated Mac build instructions
This uses Qt5 downloaded from their website (as Qt5 from homebrew
fails to link and thus is not working for me) and our custom
libdivecomputer and marble

[Dirk Hohndel: reformatted, minor typos fixed, removed the conflicting
               MacPorts instructions]

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-26 08:35:41 -08:00
Dirk Hohndel
794eb1af1b Fix INSTALL file
Not sure what I was thinking there...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 20:05:27 -08:00
Dirk Hohndel
01fee39da0 Small tweaks to the INSTALL file
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-16 11:56:39 -08:00
Dirk Hohndel
da16258d61 INSTALL file: add Windows cross building instructions
And other small adjustments

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 18:19:21 -08:00
Dirk Hohndel
899d3aeb3a Update INSTALL file with package names for Debian and OpenSUSE
Still TODO are Mac and cross building

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 14:53:04 -08:00
Dirk Hohndel
e63b642252 Document the use of SPECIAL_MARBLE_PREFIX=1
Since we suggest building with our marble branch we need to tell people to use
SPECIAL_MARBLE_PREFIX=1 or the build process won't find the correct library.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-15 12:11:14 -08:00
Dirk Hohndel
29d4716af0 First cut of updates to the INSTALL file
Mention our Subsurface branches of Marble and libdivecomputer
Massive update of the Linux build instructions

TODO: correct package lists for the different Linux distributions
TODO: update instructions for Mac
TODO: update crossbuild instructions

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14 22:19:48 -08:00
Robert C. Helling
584775cbc0 Added XCode to Mac build instructions
In order to compile anything on Mac you need to have XCode and its command
line tools.

After an OSX update (as I just did to Yosemite) the command line tools
have to be reinstalled. Otherwise there are strange error message about
missing header files for libusb2 (even though that is still installed
via homebrew).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01 14:17:22 -08:00
Miika Turkia
cc857e6fe4 Add qtwebkit-devel to Fedora installation reqs
One more packet needed to compile on Fedora.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-22 06:48:14 -08:00
Dirk Hohndel
1723c01603 Replace other references to hohndel.org
The only place where I'm not sure if there are unintended sideeffects of
changing over to the new domain is QCoreApplication::setOrganizationDomain

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-18 13:13:39 +00:00
Dirk Hohndel
4edf37f9be Update cross building for Windows on Linux
This updates the instructions and the plumbing to be able to link against
a locally built libgit2

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-07 16:33:00 -08:00
Giuseppe 'ferdy' Miceli
fcc2af6941 Add libgit2 dependency to INSTALL file (MacPorts stanza)
Signed-off-by: Giuseppe 'ferdy' Miceli <ferdy@ferdy.it>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-07 09:25:28 -08:00
Giuseppe 'ferdy' Miceli
7b1a797518 Add alternate instructions for building on MacOSX using MacPorts
This modifies the INSTALL file to offer MacPorts based instructions.

Signed-off-by: Giuseppe 'ferdy' Miceli <ferdy@ferdy.it>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-04 13:25:19 -08:00
Dirk Hohndel
9712999e66 User correct branch name for Marble
Oops, that was the tag, not the branch.

Reported-by: Darren Hart <darren@dvhart.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-02-23 08:41:47 -08:00
Dirk Hohndel
a9b7b411dc Minor tweaks to INSTALL file
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-15 08:15:45 -08:00
Miika Turkia
86d4a3db92 Mention that Qt version is needed for build-dep
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-12 16:31:29 -08:00
Miika Turkia
247e5a0db0 Use sudo when installing compile dependencies
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-12 16:31:27 -08:00
Miika Turkia
007aa79fd7 List packages required for compile on Debian
The list of required packages to compile on Debian and Ubuntu.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-12 15:07:45 -08:00
Dirk Hohndel
d541b9fd42 INSTALL file: correct Debian build dependency install
I wrote this on a plane from memory. Forgot the dash.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-12 13:27:21 -08:00
Dirk Hohndel
7f2108ff52 Update INSTALL file
Create a brief introduction and pull the build options for Subsurface to
the top of the file.
Make the build instructions for the different platforms somewhat more
consistent
Mention the need for qmake-qt4 on some Linux distros

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-12 17:14:54 +01:00
Pierre-Yves Chibon
2b4c7be9d7 Small addition to the INSTALL instructions for Fedora
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-12-09 21:39:18 +01:00
Dirk Hohndel
ca819b2a09 Updated instructions for cross building Windows binaries under Linux
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-27 17:49:23 -08:00
Dirk Hohndel
d2af6054a3 Make a note about the plugin location issue on Mac
In order to be able to create deployable DMGs this is necessary

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-27 16:37:06 -08:00
Thiago Macieira
27bfc587cf Update the Mac instructions to include an install_name_tool step
This changes the Mach-O library ID to match the install path. The
library ID is copied by the linker when Subsurface is linked against
Marble and can be seen with otool -L. That's also what macdeployqt
uses to find the dependencies: if the file matching the name in otool
-L exists, macdeployqt will deploy the library and update the search
paths.

Conclusion: after this patch, the "make mac-deploy" command will also
deploy Marble correctly.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-27 14:12:25 -08:00
Dirk Hohndel
f434417971 Improvements to INSTALL instructions
Some words about cross building Marble and a hint about Debug vs. Release
builds

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-27 14:11:47 -08:00
Pablo Wolter
66cdb3689a INSTALL instructions correction
This fixes the INSTALL instructions. The line to install home-brew is missing the “install” at the end and a small typo in the marble compilation instructions.

Saludos,

Pablo.

From 152395059af546273f38721e5c8ae1d19e2d73c3 Mon Sep 17 00:00:00 2001
From: Pablo Wolter <pwolter@gmail.com>
Date: Sat, 23 Nov 2013 16:10:02 -0800
Subject: [PATCH] Small correction to the installation instructions. Added
 "install" to the end of the ruby command to install homebrew and a typo in
 the compilation instructions for marble.

Signed-off-by: Pablo Wolter <pwolter@Pablos-MacBook-Pro.local>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-11-23 22:02:14 -08:00
Lubomir I. Ivanov
561d00d599 INSTALL: add notes for a native win32 build
There are more details to it, but i decided to exclude them
as these seem situational:

- libraries tend to mostly fail to build from source on win32...
- libiconv may be required by an oddly pre-built libxml2 package
- pkg-config requires a CMD wrapper so that an extra CRLF line is
trimmed from stdout

If someone takes on this task, i guess he/she may pop on the
mailing list for questions.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-14 13:15:27 -07:00
Thiago Macieira
84549b891f Advise people to compile libdivecomputer only statically
Because Linus says so.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-11 10:20:33 -07:00
Dirk Hohndel
44e43356e2 Fix typo in the Mac build instructions
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-10 07:53:35 -07:00
Dirk Hohndel
9a37d64826 Now bundle install on the Mac works without sudo
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-09 13:44:44 -07:00
Dirk Hohndel
3554e1de19 Small fixes to the build notes for Mac
Use the correct git tree for libdivecomputer.
Only build libmarble, not all of marble
Don't try make install for libmarble - it's bogus
Copy the correct marble headers
Only use sudo to write into /Applications

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-10-09 13:20:04 -07:00
Thiago Macieira
3cbd961ce3 Update the README and create an INSTALL file.
Let the README contain generic information and move the build
instructions to the INSTALL file.

Signed-off-by: Thiago Macieira <thiago@macieira.org>
2013-10-08 23:29:44 -07:00