Skip to content
Snippets Groups Projects
Commit 54594d14 authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge remote-tracking branch 'origin/reformat-readme'

parents beef5908 ab8979a1
No related merge requests found
......@@ -42,21 +42,20 @@ a stack trace after a crash.
Please follow these steps to compile Tarantool:
tarantool $ git submodule init; git submodule update # if compiling from git
# If compiling from git
tarantool $ git submodule init
tarantool $ git submodule update
tarantool $ cmake .
tarantool $ make
tarantool $ cmake .
tarantool $ make
To use a different release type, say, RelWithDebugInfo, use:
tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo
tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo
Additional build options can be set similarly:
tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true
-- builds the command line client.
tarantool $ cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=true # builds the command line client.
'make' creates tarantool_box executable in directory
src/box and tarantool executable in client/tarantool.
......@@ -71,29 +70,26 @@ additional Python modules:
Once all pre-requisites are installed, try:
tarantool $ cd test && ./test-run.py --suite box --start-and-exit
tarantool $ cd test
tarantool $ ./test-run.py --suite box --start-and-exit
This will create a 'var' subdirectory in directory 'test',
populate it with necessary files, and
start the server. To connect, you could use
a simple command-line client:
'''
tarantool $ ./test/tarantool
'''
tarantool $ ./test/tarantool
Alternatively, if a customized server configuration is required,
you could follow these steps:
```
tarantool $ emacs cfg/tarantool.cfg # edit the configuration
# Initialize the storage directory, path to this directory
# is specified in the configuration file:
tarantool $ src/box/tarantool_box --config cfg/tarantool.cfg --init-storage
#
# run
tarantool $ src/box/tarantool_box --config cfg/tarantool.cfg
```
tarantool $ emacs cfg/tarantool.cfg # edit the configuration
# Initialize the storage directory, path to this directory
# is specified in the configuration file:
tarantool $ src/box/tarantool_box --config cfg/tarantool.cfg --init-storage
# Run tarantool
tarantool $ src/box/tarantool_box --config cfg/tarantool.cfg
Please report bugs at http://bugs.launchpad.net/tarantool or
http://github.com/tarantool/tarantool/issues
......
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