diff --git a/.gitignore b/.gitignore index cd299e2268dcf7fae5489505bbc3a1c15cbbac12..18357cfe4ad81aaf61de8993f9a5a6e71a14d3e0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,8 @@ RPM TAGS extra/txt2c client/tarantool/tarantool -client/tarantool_checksum/tarantool_checksum +client/tarancheck/tarancheck +client/tarantar/tarantar cmake_install.cmake config.mk connector/c/tnt/libtarantool.so.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bf8e777d6f0b2d8fa5811b96e9c3e491ca67aff..2dff08f12f123fa6c8aa4dc222b75b1b5ddc9622 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ find_program(POD2MAN pod2man) # set (TARANTOOL_PRODUCT "box") set (TARANTOOL_MODULES "box") -set (TARANTOOL_CLIENTS "tarantool_checksum" "tarantool_snap") +set (TARANTOOL_CLIENTS "tarancheck" "tarantar") # Define PACKAGE macro in tarantool/config.h set (PACKAGE "Tarantool") diff --git a/client/tarantool_checksum/CMakeLists.txt b/client/tarancheck/CMakeLists.txt similarity index 95% rename from client/tarantool_checksum/CMakeLists.txt rename to client/tarancheck/CMakeLists.txt index fadc74533c73788082dfd0338d88dd091e12839c..57b4995cbbbf1742bfae826352ef1ad638c8e8eb 100644 --- a/client/tarantool_checksum/CMakeLists.txt +++ b/client/tarancheck/CMakeLists.txt @@ -1,6 +1,6 @@ project(tnt_checksum) -set (util_checksum "tarantool_checksum") +set (util_checksum "tarancheck") set (util_checksum_sources tc_main.c tc_options.c tc_config.c tc_space.c tc_file.c tc_generate.c tc_verify.c) set (util_checksum_libs tntrpl tntnet tnt gopt) diff --git a/client/tarantool_checksum/tc_config.c b/client/tarancheck/tc_config.c similarity index 100% rename from client/tarantool_checksum/tc_config.c rename to client/tarancheck/tc_config.c diff --git a/client/tarantool_checksum/tc_config.h b/client/tarancheck/tc_config.h similarity index 100% rename from client/tarantool_checksum/tc_config.h rename to client/tarancheck/tc_config.h diff --git a/client/tarantool_checksum/tc_file.c b/client/tarancheck/tc_file.c similarity index 100% rename from client/tarantool_checksum/tc_file.c rename to client/tarancheck/tc_file.c diff --git a/client/tarantool_checksum/tc_file.h b/client/tarancheck/tc_file.h similarity index 100% rename from client/tarantool_checksum/tc_file.h rename to client/tarancheck/tc_file.h diff --git a/client/tarantool_checksum/tc_generate.c b/client/tarancheck/tc_generate.c similarity index 100% rename from client/tarantool_checksum/tc_generate.c rename to client/tarancheck/tc_generate.c diff --git a/client/tarantool_checksum/tc_generate.h b/client/tarancheck/tc_generate.h similarity index 100% rename from client/tarantool_checksum/tc_generate.h rename to client/tarancheck/tc_generate.h diff --git a/client/tarantool_checksum/tc_hash.h b/client/tarancheck/tc_hash.h similarity index 100% rename from client/tarantool_checksum/tc_hash.h rename to client/tarancheck/tc_hash.h diff --git a/client/tarantool_checksum/tc_key.h b/client/tarancheck/tc_key.h similarity index 100% rename from client/tarantool_checksum/tc_key.h rename to client/tarancheck/tc_key.h diff --git a/client/tarantool_checksum/tc_main.c b/client/tarancheck/tc_main.c similarity index 100% rename from client/tarantool_checksum/tc_main.c rename to client/tarancheck/tc_main.c diff --git a/client/tarantool_checksum/tc_options.c b/client/tarancheck/tc_options.c similarity index 100% rename from client/tarantool_checksum/tc_options.c rename to client/tarancheck/tc_options.c diff --git a/client/tarantool_checksum/tc_options.h b/client/tarancheck/tc_options.h similarity index 100% rename from client/tarantool_checksum/tc_options.h rename to client/tarancheck/tc_options.h diff --git a/client/tarantool_checksum/tc_space.c b/client/tarancheck/tc_space.c similarity index 100% rename from client/tarantool_checksum/tc_space.c rename to client/tarancheck/tc_space.c diff --git a/client/tarantool_checksum/tc_space.h b/client/tarancheck/tc_space.h similarity index 100% rename from client/tarantool_checksum/tc_space.h rename to client/tarancheck/tc_space.h diff --git a/client/tarantool_checksum/tc_verify.c b/client/tarancheck/tc_verify.c similarity index 100% rename from client/tarantool_checksum/tc_verify.c rename to client/tarancheck/tc_verify.c diff --git a/client/tarantool_checksum/tc_verify.h b/client/tarancheck/tc_verify.h similarity index 100% rename from client/tarantool_checksum/tc_verify.h rename to client/tarancheck/tc_verify.h diff --git a/client/tarantool_snap/CMakeLists.txt b/client/tarantar/CMakeLists.txt similarity index 96% rename from client/tarantool_snap/CMakeLists.txt rename to client/tarantar/CMakeLists.txt index ba3b18ace8d3a2b8bc108b9fed782e576056b365..e0f1535793c14422af78b91926a0dd657fce6dbf 100644 --- a/client/tarantool_snap/CMakeLists.txt +++ b/client/tarantar/CMakeLists.txt @@ -1,6 +1,6 @@ project(tnt_snap) -set (util_snap "tarantool_snap") +set (util_snap "tarantar") set (util_snap_sources sha1.c main.c config.c space.c options.c indexate.c ref.c cursor.c snapshot.c update.cc compat.c) set (util_snap_libs tntrpl tntnet tnt) diff --git a/client/tarantool_snap/compat.c b/client/tarantar/compat.c similarity index 100% rename from client/tarantool_snap/compat.c rename to client/tarantar/compat.c diff --git a/client/tarantool_snap/config.c b/client/tarantar/config.c similarity index 100% rename from client/tarantool_snap/config.c rename to client/tarantar/config.c diff --git a/client/tarantool_snap/config.h b/client/tarantar/config.h similarity index 100% rename from client/tarantool_snap/config.h rename to client/tarantar/config.h diff --git a/client/tarantool_snap/cursor.c b/client/tarantar/cursor.c similarity index 100% rename from client/tarantool_snap/cursor.c rename to client/tarantar/cursor.c diff --git a/client/tarantool_snap/cursor.h b/client/tarantar/cursor.h similarity index 100% rename from client/tarantool_snap/cursor.h rename to client/tarantar/cursor.h diff --git a/client/tarantool_snap/hash.h b/client/tarantar/hash.h similarity index 100% rename from client/tarantool_snap/hash.h rename to client/tarantar/hash.h diff --git a/client/tarantool_snap/indexate.c b/client/tarantar/indexate.c similarity index 100% rename from client/tarantool_snap/indexate.c rename to client/tarantar/indexate.c diff --git a/client/tarantool_snap/indexate.h b/client/tarantar/indexate.h similarity index 100% rename from client/tarantool_snap/indexate.h rename to client/tarantar/indexate.h diff --git a/client/tarantool_snap/key.h b/client/tarantar/key.h similarity index 100% rename from client/tarantool_snap/key.h rename to client/tarantar/key.h diff --git a/client/tarantool_snap/main.c b/client/tarantar/main.c similarity index 100% rename from client/tarantool_snap/main.c rename to client/tarantar/main.c diff --git a/client/tarantool_snap/options.c b/client/tarantar/options.c similarity index 100% rename from client/tarantool_snap/options.c rename to client/tarantar/options.c diff --git a/client/tarantool_snap/options.h b/client/tarantar/options.h similarity index 100% rename from client/tarantool_snap/options.h rename to client/tarantar/options.h diff --git a/client/tarantool_snap/ref.c b/client/tarantar/ref.c similarity index 100% rename from client/tarantool_snap/ref.c rename to client/tarantar/ref.c diff --git a/client/tarantool_snap/ref.h b/client/tarantar/ref.h similarity index 100% rename from client/tarantool_snap/ref.h rename to client/tarantar/ref.h diff --git a/client/tarantool_snap/sha1.c b/client/tarantar/sha1.c similarity index 100% rename from client/tarantool_snap/sha1.c rename to client/tarantar/sha1.c diff --git a/client/tarantool_snap/sha1.h b/client/tarantar/sha1.h similarity index 100% rename from client/tarantool_snap/sha1.h rename to client/tarantar/sha1.h diff --git a/client/tarantool_snap/snapshot.c b/client/tarantar/snapshot.c similarity index 100% rename from client/tarantool_snap/snapshot.c rename to client/tarantar/snapshot.c diff --git a/client/tarantool_snap/snapshot.h b/client/tarantar/snapshot.h similarity index 100% rename from client/tarantool_snap/snapshot.h rename to client/tarantar/snapshot.h diff --git a/client/tarantool_snap/space.c b/client/tarantar/space.c similarity index 100% rename from client/tarantool_snap/space.c rename to client/tarantar/space.c diff --git a/client/tarantool_snap/space.h b/client/tarantar/space.h similarity index 100% rename from client/tarantool_snap/space.h rename to client/tarantar/space.h diff --git a/client/tarantool_snap/ts.h b/client/tarantar/ts.h similarity index 100% rename from client/tarantool_snap/ts.h rename to client/tarantar/ts.h diff --git a/client/tarantool_snap/update.cc b/client/tarantar/update.cc similarity index 100% rename from client/tarantool_snap/update.cc rename to client/tarantar/update.cc diff --git a/client/tarantool_snap/update.h b/client/tarantar/update.h similarity index 100% rename from client/tarantool_snap/update.h rename to client/tarantar/update.h