Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated link for documentation and added more info to osx build #5259

Merged
merged 7 commits into from
Nov 23, 2016

Conversation

JKawohl
Copy link
Contributor

@JKawohl JKawohl commented Oct 19, 2016

I have just updated the link to the documentation to the proper version, and added some verboseness in the osx documentation

@mention-bot
Copy link

@kawohl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @danimo, @felixboehm and @carlaschroder to be potential reviewers.

@@ -234,6 +241,7 @@ To build the most up-to-date version of the client:
.. 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``.
.. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/ -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/ -D_OPENSSL_VERSION=1.0.2a -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add some info that you could/should have QtKeyChain to the same CMAKE_INSTALL_PREFIX?

@carlaschroder
Copy link
Contributor

👍 for correct spelling and grammar. yay updated build docs!

@guruz guruz added this to the 2.3.0 milestone Nov 22, 2016
@guruz
Copy link
Contributor

guruz commented Nov 22, 2016

This branch has conflicts that must be resolved

Says the CI above..

@kawohl

1. Install Xcode
2. Install Xcode command line tools::
xcode-select --install

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need an empty line between 'Install Xcode command line tools::' and 'xcode-select --install' for the markup to render the code blocks correctly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Click the View button if you want to see how it looks.


3. Install homebrew::
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need an empty line between 'Install homebrew::' and the command for the markup to render the code blocks correctly.

@@ -234,6 +244,10 @@ To build the most up-to-date version of the client:
.. 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``.

..note:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need a space between the two leading dots and note in '..note::'

Three notes in a row means maybe there are too many notes :) Not everything needs to be a note.

@JKawohl
Copy link
Contributor Author

JKawohl commented Nov 23, 2016

Thanks for reviewing!

@JKawohl JKawohl merged commit ca9ec46 into owncloud:master Nov 23, 2016
@carlaschroder
Copy link
Contributor

I think you need to backport to 2.2.

@carlaschroder
Copy link
Contributor

The milestone is 2.3, but the readme is updated to say 2.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants