diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000000000000000000000000000000000..38a018de7cfe77251b057d0f13c1298e63d28b89 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,9 @@ +[submodule "deps/libevent"] + path = deps/libevent + url = https://github.com/libevent/libevent +[submodule "deps/googletest"] + path = deps/googletest + url = https://github.com/google/googletest +[submodule "deps/jsoncpp"] + path = deps/jsoncpp + url = https://github.com/open-source-parsers/jsoncpp.git diff --git a/deps/googletest b/deps/googletest new file mode 160000 index 0000000000000000000000000000000000000000..93f08be653c36ddc6943e9513fc14c7292b4d007 --- /dev/null +++ b/deps/googletest @@ -0,0 +1 @@ +Subproject commit 93f08be653c36ddc6943e9513fc14c7292b4d007 diff --git a/deps/jsoncpp b/deps/jsoncpp new file mode 160000 index 0000000000000000000000000000000000000000..8190e061bc2d95da37479a638aa2c9e483e58ec6 --- /dev/null +++ b/deps/jsoncpp @@ -0,0 +1 @@ +Subproject commit 8190e061bc2d95da37479a638aa2c9e483e58ec6 diff --git a/deps/libevent b/deps/libevent new file mode 160000 index 0000000000000000000000000000000000000000..117ee9a03fc74617e378f755c6b25005ac0e954f --- /dev/null +++ b/deps/libevent @@ -0,0 +1 @@ +Subproject commit 117ee9a03fc74617e378f755c6b25005ac0e954f diff --git a/docs/how_to_build.md b/docs/how_to_build.md index d11e9da9558f50e037796f5523cc82b4cef31b66..f90287710d980fe868b4ba8be205a8b7894b1068 100644 --- a/docs/how_to_build.md +++ b/docs/how_to_build.md @@ -8,6 +8,18 @@ MiniOB 需要使用: - cmake 版本 >= 3.10 - gcc/clang gcc建议8.3以上,编译器需要支持c++14等新标准 +获取MiniOB的submodule +```bash +cd `project home` +git submodule init +git submodule update +# or +git submodule update --init + +# 或者通过以下方式自动初始化并更新仓库中的每一个子模块 +git clone --recurse-submodules https://github.com/oceanbase/miniob.git +``` + 1. install cmake 需要安装了3.10或以上版本的cmake,可以跳过此步骤。 @@ -94,7 +106,6 @@ https://www.multiprecision.org/mpc/download.html 3. build libevent ```bash -git submodule add https://github.com/libevent/libevent deps/libevent cd deps cd libevent git checkout release-2.1.12-stable @@ -108,7 +119,6 @@ sudo make install 4. build google test ```bash -git submodule add https://github.com/google/googletest deps/googletest cd deps cd googletest mkdir build @@ -121,7 +131,6 @@ sudo make install 5. build jsoncpp ```bash -git submodule add https://github.com/open-source-parsers/jsoncpp.git deps/jsoncpp cd deps cd jsoncpp mkdir build