From 7e63fd535e5fdce349aa94df800022fbc83fe826 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Mon, 16 Jul 2018 11:09:05 +0200 Subject: [PATCH 1/2] Updates the README with build instructions. - Adds a shorter version of how to build the client but the extended version will be kept on the Wiki. - Makes the instructions available if you clone the repo and work offline. --- README.md | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b016f73fa2..b6c999805d 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,38 @@ with your computer. ### :hammer_and_wrench: How to compile the desktop client -- Instructions for compiling the client on Linux, Windows and mac OS can be found at: -[Wiki/How to compile the desktop client](https://github.com/nextcloud/desktop/wiki/How-to-compile-the-desktop-client). +#### :memo: Step by step instructions + +##### Clone the repo and create build directory +``` +$ git clone git@github.com:nextcloud/desktop.git +$ cd desktop +$ mkdir build +``` +##### Compile and install + +##### Linux + +``` +$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 +$ make install +``` + +##### Windows + +``` +$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 +$ cmake --build . --config Debug --target install +``` + +##### Mac OS + +``` +$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 +$ make install +``` + +More detailed instructions can be found at the [Desktop Client Wiki](https://github.com/nextcloud/desktop/wiki). ### :inbox_tray: Where to find binaries to download From 2511105cce28b6e34c6d0236a997c892ff67d529 Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Mon, 16 Jul 2018 11:31:34 +0200 Subject: [PATCH 2/2] Adds link to wiki page 'System requirements' to README. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b6c999805d..4cbdec4c23 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,16 @@ The :computer: Nextcloud Desktop Client is a tool to synchronize files from Nextcloud Server with your computer. +

+ Desktop Client on Mac OS] +

+ ## :blue_heart: :tada: Contributing ### :hammer_and_wrench: How to compile the desktop client +:building_construction: [System requirements](https://github.com/nextcloud/desktop/wiki/System-requirements-for-compiling-the-desktop-client) includes OpenSSL 1.1.x, QtKeychain, Qt 5.x.x and zlib. + #### :memo: Step by step instructions ##### Clone the repo and create build directory