From 55898c07ff329ce80252ea7a6e916db3b2f012bc Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 12 Feb 2015 02:38:08 +0200 Subject: 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 Signed-off-by: Dirk Hohndel --- INSTALL | 71 ++--------------------------------------------------------------- 1 file changed, 2 insertions(+), 69 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 108b0bd3b..3cf459036 100644 --- a/INSTALL +++ b/INSTALL @@ -339,72 +339,5 @@ Building Subsurface on Windows ------------------------------ This is NOT RECOMMENDED. To the best of our knowledge there is one single -person who regularly does this (and he provided these instructions). The -Subsurface team does not provide support for Windows binary build from -sources... - -1) Install msys-git: -http://msysgit.github.io - -Tools part of MSYS are required for building Subsurface, while you also -need Git to be upstream and contribute to the project. -Make sure that the msys/bin (or git/bin) folder is in PATH. - -2) Install Qt -http://qt-project.org/downloads - -Subsurface is currently built against Qt 4.8.5. - -3) Install a MinGW toolchain -https://docs.google.com/open?id=0B4D8x6CJEmtuczdiQklwMEs4RUU - -Qt 4.8.5 comes without a compiler and you will have to download it from -a separate location. Other compiler may work, but there are no guaranties for -that. Make sure that the mingw/bin folder is in PATH. - -4) Install Libdivecomputer -Use similar steps to the previous section, without the sudo command. - -5) Install CMake (required for building Marble): -http://www.cmake.org/cmake/resources/software.html - -Make sure that the cmake/bin folder is in PATH. - -5) Download and build Marble -http://marble.kde.org/sources.php -http://techbase.kde.org/Projects/Marble/WindowsCompiling#Compiling_Marble_using_MingW - -Make sure you build both the Debug and Release versions. - -6) Install pkg-config -http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/pkg-config_0.26-1_win32.zip - -pkg-config depends on DLL files such as libglib-2.0-0.dll and has to be in -PATH, so it's best that you copy the executable to msys/bin. - -7) Install other dependencies -Subsurface also depends on the following libraries: - -* libxml2 -http://www.xmlsoft.org/downloads.html -* libxslt -http://xmlsoft.org/XSLT/ -* libusb-1.0 -http://sourceforge.net/apps/trac/libusb-win32/wiki -* zlib -http://www.zlib.net/ -* libzip -http://www.nih.at/libzip/ - -Once you have the libraries, create .pc files (pkg-config) for them and place -the files in a folder that is indicated by the PKG_CONFIG_PATH environment -variable - e.g. PKG_CONFIG_PATH=c:\msys\pkg-config - -To build subsurface, use: - -$ git clone git://subsurface-divelog.org/subsurface.git -$ cd subsurface -$ qmake -$ make -$ make install -$ make installer +person who regularly does this. The Subsurface team does not provide support +for Windows binary build from sources... -- cgit v1.2.3-70-g09d2 From b71cd66cd2ede2587c2f4a13b47b8735313f8a10 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 17 Feb 2015 13:18:05 -0800 Subject: Document the new scripts in the INSTALL file Signed-off-by: Dirk Hohndel --- INSTALL | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index 3cf459036..bbda32e12 100644 --- a/INSTALL +++ b/INSTALL @@ -10,8 +10,7 @@ Below are instructions for building Subsurface under some popular Linux distributions, for building Subsurface using Homebrew on a Mac, and for cross-building Subsurface for Windows. The lack of a working package management system for Windows makes it really painful to build -Subsurface natively under Windows, we have some hints how to do so -here as well. +Subsurface natively under Windows, so we don't support that at all. All of the prebuilt binaries that we provide (right now Windows, Mac, Ubuntu/Debian/LinuxMint, and openSUSE/Fedora) are built using our own @@ -104,6 +103,30 @@ but on many of them this will give you the build dependencies for the official package (which is often way out of date). So be careful that this doesn't get you a Qt4 based environment +In order to build Subsurface, you have two options: + +1. the easy way +~~~~~~~~~~~~~~~ + +Use the supplied build script. This should work on most systems that have +all the prerequisite packages installed... + +You should have Subsurface sources checked out in a sane place, something +like this: + +mkdir -p ~/src +cd ~/src +git clone -b v4.4.1 git://subsurface-divelog.org/subsurface +./subsurface/scripts/build.sh # <- this step will take quite a while as it + # compiles a handful of libraries before + # building Subsurface + +Now you can run Subsurface like this: + +./subsurface/scripts/run.sh + +2. the harder way +~~~~~~~~~~~~~~~~~ First you need to compile our version of libdivecomputer: -- cgit v1.2.3-70-g09d2 From 86274b603e6e18e8bfa5921a062ad6365d18af97 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 17 Feb 2015 23:06:43 -0800 Subject: build.sh: use setRpath and remove run.sh Signed-off-by: Dirk Hohndel --- INSTALL | 3 ++- scripts/build.sh | 2 +- scripts/run.sh | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100755 scripts/run.sh (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index bbda32e12..c0bb7882a 100644 --- a/INSTALL +++ b/INSTALL @@ -123,7 +123,8 @@ git clone -b v4.4.1 git://subsurface-divelog.org/subsurface Now you can run Subsurface like this: -./subsurface/scripts/run.sh +cd ~/src/subsurface +./subsurface 2. the harder way ~~~~~~~~~~~~~~~~~ diff --git a/scripts/build.sh b/scripts/build.sh index 14f235a29..9ea0f4f76 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -97,6 +97,6 @@ make -j4 make install cd $SRC/subsurface -$QMAKE LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro +$QMAKE CONFIG+=setRpath LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro make -j4 diff --git a/scripts/run.sh b/scripts/run.sh deleted file mode 100755 index 6e0e0d1e9..000000000 --- a/scripts/run.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -LD_LIBRARY_PATH=install/lib:$LD_LIBRARY_PATH ./subsurface/subsurface -- cgit v1.2.3-70-g09d2 From 56e1b11c0af4c5f08719af7786b07407cccc31c4 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 17 Feb 2015 23:23:22 -0800 Subject: Add instructions for building Subsurface under PCLinuxOS Signed-off-by: Dirk Hohndel --- INSTALL | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index c0bb7882a..b30a29467 100644 --- a/INSTALL +++ b/INSTALL @@ -95,13 +95,12 @@ sudo apt-get install git g++ make autoconf libtool cmake pkg-config \ libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \ qtscript5-dev -On Debian style distributions you can install the required development -packages by running (once Qt version of subsurface is available in your -distribution) -$ sudo apt-get build-dep subsurface -but on many of them this will give you the build dependencies for the -official package (which is often way out of date). So be careful that this -doesn't get you a Qt4 based environment +On PCLinuxOS you appear to need the following packages + +su -c "apt-get install -y autoconf automake cmake libtool gcc-c++ git \ +lib64usb1.0-devel lib64zip-devel lib64qt5webkitwidgets-devel qttools5 \ +qttranslations5 lib64qt5xml-devel lib64qt5test-devel lib64qtscript-devel \ +lib64qt5svg-devel lib64qt5concurrent-devel" In order to build Subsurface, you have two options: -- cgit v1.2.3-70-g09d2 From 25d2f187e0301d858ab55772fa89edc29fb693d2 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 18 Feb 2015 00:17:02 -0800 Subject: 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 --- INSTALL | 73 ++--------------------------------------------------------------- 1 file changed, 2 insertions(+), 71 deletions(-) (limited to 'INSTALL') diff --git a/INSTALL b/INSTALL index b30a29467..3cc8f73a8 100644 --- a/INSTALL +++ b/INSTALL @@ -102,13 +102,8 @@ lib64usb1.0-devel lib64zip-devel lib64qt5webkitwidgets-devel qttools5 \ qttranslations5 lib64qt5xml-devel lib64qt5test-devel lib64qtscript-devel \ lib64qt5svg-devel lib64qt5concurrent-devel" -In order to build Subsurface, you have two options: - -1. the easy way -~~~~~~~~~~~~~~~ - -Use the supplied build script. This should work on most systems that have -all the prerequisite packages installed... +In order to build Subsurface, use the supplied build script. This should +work on most systems that have all the prerequisite packages installed... You should have Subsurface sources checked out in a sane place, something like this: @@ -125,70 +120,6 @@ Now you can run Subsurface like this: cd ~/src/subsurface ./subsurface -2. the harder way -~~~~~~~~~~~~~~~~~ - -First you need to compile our version of libdivecomputer: - -$ mkdir ~/src # unless you have this already -$ cd ~/src -$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/libdc libdivecomputer - # or -b Subsurface-testing to get the testing version - careful, - # careful - this gets rebased and may be broken - # -> when not building a release version of Subsurface but the - # latest master, it may be necessary to build against the - # Subsurface-testing branch - -$ cd libdivecomputer -$ autoreconf --install -$ ./configure --disable-shared -$ make -$ sudo make install - -Then you compile our custom branch of libmarblewidget - -$ cd ~/src -$ git clone -b Subsurface-4.4 git://subsurface-divelog.org/marble marble-source - # or -b Subsurface-testing to get the testing version - careful, - # careful - this gets rebased and may be broken - -$ mkdir marble-build -$ cd marble-build -$ cmake -DQTONLY=ON -DQT5BUILD=ON \ - -DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \ - -DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \ - -DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \ - -DBUILD_WITH_DBUS=OFF ../marble-source -$ make # <- this step will take quite a while... if you have more cores - # try make -j8 or something like that -$ sudo make install - -Finally you can compile Subsurface: - -$ cd ~/src -$ git clone git://subsurface-divelog.org/subsurface.git -$ cd subsurface -$ git checkout v4.4 # this get's you the last release - # skip this step to build the latest development - # version -$ qmake SPECIAL_MARBLE_PREFIX=1 -# on Fedora/OpenSUSE you need qmake-qt5 -$ make -$ sudo make install # [optionally, add: prefix=/usr/local] - -At least on Fedora and OpenSUSE you need to make sure that /usr/local/lib -is searched for shared libraries (this is where the steps above installed -libdivecomputer and libmarblewidget in order not to conflict with system -pacakges). So you need to do the following: - -$ sudo echo "/usr/local/lib" > /etc/ld.so.conf.d/local.conf -$ sudo ldconfig - -Now you should be able to start the Subsurface binary you just created -with - -$ ./subsurface - Building Subsurface under MacOSX (using Homebrew) ------------------------------------------------- -- cgit v1.2.3-70-g09d2