Skip to content
Snippets Groups Projects
Commit 636afd86 authored by Eugine Blikh's avatar Eugine Blikh
Browse files

Merge branch 'stable'

Conflicts:
	doc/www-data.in/download.cmake
parents 50fea7de ef356ec6
No related branches found
No related tags found
No related merge requests found
......@@ -6,9 +6,9 @@ This manual explains how to manually build tarantool from sources.
Supporting kinds of build with default Apple developer software and external as
homebrew as MacPorts.
If you want to build at the Homebrew environment execute just:
If you want to build at the Homebrew environment execute:
brew install https://raw.githubusercontent.com/tarantool/tarantool/master/extra/tarantool.rb
brew install https://raw.githubusercontent.com/tarantool/tarantool/master/extra/tarantool.rb --devel
Possible flags are:
......@@ -56,15 +56,15 @@ the directory the module's archive deflates into.
NOTE: If you want to get DMG package go to section 6.
git clone --recursive git://github.com/tarantool/tarantool.git
git clone --recursive git://github.com/tarantool/tarantool.git
cd tarantool
mkdir build && cd build
CC=clang CXX=clang++ cmake .. \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DENABLE_CLIENT=true \
-DDARWIN_BUILD_TYPE=Ports
make
cd tarantool
mkdir build && cd build
CC=clang CXX=clang++ cmake .. \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DENABLE_CLIENT=true \
-DDARWIN_BUILD_TYPE=Ports
make
5. Run tarantool test suite
-------------
......
......@@ -67,9 +67,9 @@ download:
sudo apt-get install tarantool
```
### CentOS 5-6 and RHEL 5-6
### CentOS 5-7 and RHEL 5-7
CentOS repository is available at [http://tarantool.org/dist/master/centos]
CentOS and RHEL repository is available at [http://tarantool.org/dist/master/centos]
Add the following section to your yum repository list (/etc/yum.repos.d/tarantool.repo)
to enable it:
......@@ -82,7 +82,7 @@ download:
gpgcheck=0
```
### Fedora
### Fedora 19, 20 and Rawhide
Fedora repository is available at [http://tarantool.org/dist/master/fedora]
......@@ -120,7 +120,7 @@ download:
You can install Tarantool using homebrew:
```
$ brew install https://raw.githubusercontent.com/tarantool/tarantool/stable/extra/tarantool.rb
$ brew install https://raw.githubusercontent.com/tarantool/tarantool/stable/extra/tarantool.rb --devel
```
Please upgrade `clang` to version 3.2 or later using
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment