From 0257109284852bf0e6debb144f2492423aeb11e5 Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Tue, 28 Jul 2015 18:25:19 +0000
Subject: [PATCH] Task #8185: update INSTALL. Piggy back irrel update of
 installation doc on this task.

---
 INSTALL | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/INSTALL b/INSTALL
index 78bb67dafc5..c7c5cfe28a9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -41,7 +41,7 @@ For Ubuntu/Mint (likely incomplete list, but goes a long way):
         apt-get install libpng12-dev                         # or a newer version (for AOFlagger)
 
 	apt-get install libreadline-dev libpqxx-dev doxygen  # optional
-	apt-get install libunittest++-dev                    # optional, to run all regression tests
+	apt-get install libunittest++-dev                    # optional, for tests that use UnitTest++
         apt-get install libgsl0-dev                          # optional, for AOFlagger's RayleighFitter
 	apt-get install libgtkmm-2.4-dev libsigc++-2.0-dev   # optional, for AOFlagger's rficonsole
 
@@ -56,10 +56,10 @@ For CentOS/Fedora (likely incomplete list, but goes a long way):
         yum install gtkmm24-devel libsigc++20-devel          # optional, for AOFlagger's rficonsole
 
 	The blitz and blitz-devel pkgs are available on some distros, but not on e.g. CentOS 7.
-        If indeed required for your build, but not in your repo, take the two RPMs from CentOS 6.
-	Idem for log4cplus (LOFAR log4cxx is dodgy).
-	Similar for unittest++ and unitest++-devel (both optional), but take two RPMs from Fedora 22.
-	If you have LOFAR Redmine access, see: https://support.astron.nl/lofar_issuetracker/issues/8161
+        If required for your build, but not in your repo, take the two RPMs from CentOS 6 (or build from source).
+	Idem for log4cplus (LOFAR log4cxx support is dodgy).
+	Similar for unittest++ and unitest++-devel (both optional), but take two RPMs from Fedora 22 (or build from source).
+	RPMs known to work on CentOS 7 can be found at: https://support.astron.nl/lofar_issuetracker/issues/8161
 
 
 
@@ -74,32 +74,35 @@ NOTE (any OS): The most prominent dependency you likely need to build from sourc
 Instructions for Manual Build from Source
 -----------------------------------------
 
-- SVN checkout a tagged release x.y.z (or the trunk) from https://svn.astron.nl/LOFAR/ into e.g. $HOME/src/LOFAR-x.y.z/
+- SVN checkout build and configuration scripts of a tagged release x.y.z (or the
+  trunk) from https://svn.astron.nl/LOFAR/ into e.g. $HOME/src/LOFAR-x.y.z/
 
-	LOFAR_VERSION=LOFAR-Release-x.y.z  # set to used release version
-	svn checkout https://svn.astron.nl/LOFAR/tags/$LOFAR_VERSION "$HOME/src/$LOFAR_VERSION"
+	LOFAR_RELEASE=LOFAR-Release-x.y.z  # set to used release version
+	svn checkout --depth=files "https://svn.astron.nl/LOFAR/tags/$LOFAR_RELEASE" "$HOME/src/$LOFAR_RELEASE"
+	svn update --depth=infinity "$HOME/src/$LOFAR_RELEASE/CMake"
 
-- Install the usual offline data reduction (imaging) packages into e.g. $HOME/local/$LOFAR_VERSION/
+- Auto-checkout and install the usual offline data reduction (imaging) packages
+  into e.g. $HOME/local/$LOFAR_RELEASE/
   (Only ends succesfully once CMake can find all required dependencies.)
 
-	mkdir -p $HOME/build/$LOFAR_VERSION/gnu_opt  # last directory must be {gnu|clang}_{debug|opt}
-	cd $HOME/build/$LOFAR_VERSION/gnu_opt
-	cmake -DCMAKE_INSTALL_PREFIX="$HOME/local/$LOFAR_VERSION" -DBUILD_PACKAGES="DP3 Calibration Imager PyBDSM" -DUSE_OPENMP=ON "$HOME/src/$LOFAR_VERSION"
+	mkdir -p $HOME/build/$LOFAR_RELEASE/gnu_opt  # last directory must be {gnu|clang}_{debug|opt}
+	cd $HOME/build/$LOFAR_RELEASE/gnu_opt
+	cmake -DCMAKE_INSTALL_PREFIX="$HOME/local/$LOFAR_RELEASE" -DBUILD_PACKAGES="DP3 Calibration Imager PyBDSM" -DUSE_OPENMP=ON "$HOME/src/$LOFAR_RELEASE"
 
 - Build and install:
 
-	make -j4
-	make install  # with sufficient privileges
+	make -j 4
+	make -j 4 install  # with sufficient privileges
 
 - Optionally, run the regression tests:
 
-	ctest -j4
+	ctest -j 4 --timeout 60
 
-  All tests should pass, however, some packages require certain hardware or
-  software (e.g. RTCP needs CUDA GPUs) to pass.
+  All tests should pass, however, a few packages (not selected above) require
+  GPU hardware or a database to pass.
 
 - You may want to add the installation path bin/ to your PATH:
 
-	. "$HOME/local/$LOFAR_VERSION/lofarinit.sh"  # for Bourne-like shells, or
-	. "$HOME/local/$LOFAR_VERSION/lofarinit.csh" # for C-like shells
+	source "$HOME/local/$LOFAR_RELEASE/lofarinit.sh"  # for Bourne-like shells, or
+	source "$HOME/local/$LOFAR_RELEASE/lofarinit.csh" # for C-like shells
 
-- 
GitLab