From 120de0e0ca62d07e429514319f3c046cb04c4a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=85=8B?= <31796712+FrankXMX@users.noreply.github.com> Date: Mon, 3 Oct 2022 10:28:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96git=20submodule=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E6=A0=87=E5=87=86=E5=8C=96git=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20(#94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 简化git submodule操作 --- .gitmodules | 9 +++++++++ deps/googletest | 1 + deps/jsoncpp | 1 + deps/libevent | 1 + docs/how_to_build.md | 15 ++++++++++++--- 5 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 deps/googletest create mode 160000 deps/jsoncpp create mode 160000 deps/libevent diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..38a018d --- /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 0000000..93f08be --- /dev/null +++ b/deps/googletest @@ -0,0 +1 @@ +Subproject commit 93f08be653c36ddc6943e9513fc14c7292b4d007 diff --git a/deps/jsoncpp b/deps/jsoncpp new file mode 160000 index 0000000..8190e06 --- /dev/null +++ b/deps/jsoncpp @@ -0,0 +1 @@ +Subproject commit 8190e061bc2d95da37479a638aa2c9e483e58ec6 diff --git a/deps/libevent b/deps/libevent new file mode 160000 index 0000000..117ee9a --- /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 d11e9da..f902877 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 -- GitLab