diff --git a/.gitignore b/.gitignore index d5de225259..e13fac9b5f 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,7 @@ apikey.txt /locale/ru/LC_MESSAGES/reference/reference_rock/luatest/modules/ /locale/ru/LC_MESSAGES/reference/reference_rock/luatest/classes/ +# tntcxx submodule + +/doc/getting_started/getting_started_cxx.rst +/doc/getting_started/_includes/ diff --git a/.gitmodules b/.gitmodules index 66ef19fee5..3efe9f8560 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "modules/grafana-dashboard"] path = modules/grafana-dashboard url = https://github.com/tarantool/grafana-dashboard +[submodule "modules/tntcxx"] + path = modules/tntcxx + url = https://github.com/tarantool/tntcxx.git diff --git a/doc/book/connectors/index.rst b/doc/book/connectors/index.rst index a67e9a0f60..df5f3525c0 100644 --- a/doc/book/connectors/index.rst +++ b/doc/book/connectors/index.rst @@ -126,3 +126,4 @@ script: .. include:: __c.rst .. include:: __results.rst + diff --git a/doc/getting_started/getting_started_connectors.rst b/doc/getting_started/getting_started_connectors.rst index 1fd1a68093..9ecac4d20c 100644 --- a/doc/getting_started/getting_started_connectors.rst +++ b/doc/getting_started/getting_started_connectors.rst @@ -4,9 +4,12 @@ Connecting from your favorite language ================================================================================ -In the :doc:`previous section `, +In the :doc:`previous sections `, you have learned how to create a Tarantool database. -Now let's see how to connect to it from Python, PHP, and Go. +Now let's see how to connect to the database from different programming +languages, such as Python, PHP, Go, and C++, and +execute typical requests for manipulating the data (select, insert, delete, +and so on). .. toctree:: :maxdepth: 2 @@ -15,6 +18,4 @@ Now let's see how to connect to it from Python, PHP, and Go. getting_started_python getting_started_php getting_started_go - - - + getting_started_cxx diff --git a/modules/tntcxx b/modules/tntcxx new file mode 160000 index 0000000000..7c5e898830 --- /dev/null +++ b/modules/tntcxx @@ -0,0 +1 @@ +Subproject commit 7c5e898830cffe7fc6ce9ca30c295d00704ecf53 diff --git a/update_submodules.sh b/update_submodules.sh index d245b20761..01dbe9bc6e 100755 --- a/update_submodules.sh +++ b/update_submodules.sh @@ -30,6 +30,10 @@ luatest_dest="${project_root}/doc/reference/reference_rock/luatest" cartridge_kubernetes_root="${project_root}/modules/tarantool-operator/doc/cartridge_kubernetes_guide" cartridge_kubernetes_dest="${rst_dest}/" +tntcxx_root="${project_root}/modules/tntcxx" +tntcxx_gs_dest="${project_root}/doc/getting_started/" +tntcxx_api_dest="${project_root}/doc/book/connectors/" + cd "${luatest_root}" ldoc --ext=rst --dir=rst --toctree="API" . cd "${luatest_dest}" @@ -46,6 +50,9 @@ yes | cp -rf "${cartridge_cli_root}/README.rst" "${cartridge_cli_index_dest}" mkdir -p "${cartridge_kubernetes_dest}" yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}" +yes | cp -rf "${tntcxx_root}/doc/tntcxx_getting_started.rst" "${tntcxx_gs_dest}/getting_started_cxx.rst" +yes | cp -rf "${tntcxx_root}/examples/" "${tntcxx_gs_dest}/_includes/" + cd "${cartridge_root}" || exit tarantoolctl rocks install \ https://raw.githubusercontent.com/tarantool/LDoc/tarantool/ldoc-scm-2.rockspec \