From 0763f65329dbab2eb971dd11554f9ddbf5b68d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 26 Nov 2015 11:55:23 +0100 Subject: [PATCH 1/4] improved linux build instructions. I am using :: lists, as the `` versions mangle multi-line commands all in one long line. The cmake command should just end in .., not in ../client --- doc/building.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/building.rst b/doc/building.rst index 5ee84d125..ece14bf33 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -193,20 +193,20 @@ You can download the desktop sync client from the ownCloud `Client Download Page To build the most up to date version of the client: -1. Clone the latest versions of the client from Git_ as follows: +1. Clone the latest versions of the client from Git_ as follows:: - ``git clone git://github.com/owncloud/client.git`` - ``git submodule init`` - ``git submodule update`` + git clone git://github.com/owncloud/client.git + git submodule init + git submodule update -2. Create the build directory: +2. Create the build directory:: - ``mkdir client-build`` - ``cd client-build`` + mkdir client-build + cd client-build -3. Configure the client build: +3. Configure the client build:: - ``cmake -DCMAKE_BUILD_TYPE="Debug" ../client`` + cmake -DCMAKE_BUILD_TYPE="Debug" .. ..note:: You must use absolute paths for the ``include`` and ``library`` directories. From 06bb97e6d9b7649fa854695f72a2b21a210e02b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 26 Nov 2015 12:02:23 +0100 Subject: [PATCH 2/4] Update building.rst --- doc/building.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/building.rst b/doc/building.rst index ece14bf33..ca44a86f8 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -206,7 +206,7 @@ To build the most up to date version of the client: 3. Configure the client build:: - cmake -DCMAKE_BUILD_TYPE="Debug" .. + cmake -DCMAKE_BUILD_TYPE="Debug" ../client ..note:: You must use absolute paths for the ``include`` and ``library`` directories. From f54f48615d856d411f3c02bac5ee148664056e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 26 Nov 2015 12:06:32 +0100 Subject: [PATCH 3/4] Update building.rst ah, and the instructions miss the 'cd client' before git submodule init. --- doc/building.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/building.rst b/doc/building.rst index ca44a86f8..e9fa4ceb3 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -196,6 +196,7 @@ To build the most up to date version of the client: 1. Clone the latest versions of the client from Git_ as follows:: git clone git://github.com/owncloud/client.git + cd client git submodule init git submodule update @@ -206,7 +207,7 @@ To build the most up to date version of the client: 3. Configure the client build:: - cmake -DCMAKE_BUILD_TYPE="Debug" ../client + cmake -DCMAKE_BUILD_TYPE="Debug" .. ..note:: You must use absolute paths for the ``include`` and ``library`` directories. From f2c9a49c509404bbcdc030e6be0778f1f2e13bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Weigert?= Date: Thu, 3 Dec 2015 14:04:43 +0100 Subject: [PATCH 4/4] fixed formatting lines 212 215 --- doc/building.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/building.rst b/doc/building.rst index e9fa4ceb3..112f92a31 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -209,10 +209,10 @@ To build the most up to date version of the client: cmake -DCMAKE_BUILD_TYPE="Debug" .. - ..note:: You must use absolute paths for the ``include`` and ``library`` + .. note:: You must use absolute paths for the ``include`` and ``library`` directories. - ..note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``, + .. note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``, where ``target`` is a private location, i.e. in parallel to your build dir by specifying ``../install``.