From 88657e7d11dbef873cffca61d507dbff8d4cf9b7 Mon Sep 17 00:00:00 2001 From: Nobody Date: Sat, 28 May 2022 18:20:50 +0500 Subject: [PATCH] Move project library crates to git submodules to make life a bit easier --- .gitmodules | 12 ++++++++++++ Cargo.toml | 8 ++++---- README.md | 2 +- kcp | 1 + lua_serde | 1 + mhycrypt | 1 + packet-processor/Cargo.toml | 2 +- proto | 1 + 8 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 160000 kcp create mode 160000 lua_serde create mode 160000 mhycrypt create mode 160000 proto diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2415a65 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "proto"] + path = proto + url = ../proto +[submodule "mhycrypt"] + path = mhycrypt + url = ../mhycrypt +[submodule "kcp"] + path = kcp + url = ../kcp +[submodule "lua_serde"] + path = lua_serde + url = ../lua_serde diff --git a/Cargo.toml b/Cargo.toml index 6b13151..4560be7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,10 +9,10 @@ edition = "2018" raw_packet_dump = [] [dependencies] -kcp = { path = "../kcp" } -mhycrypt = { path = "../mhycrypt" } -proto = { path = "../proto" } -lua_serde = { path = "../lua_serde" } +kcp = { path = "kcp" } +mhycrypt = { path = "mhycrypt" } +proto = { path = "proto" } +lua_serde = { path = "lua_serde" } packet-processor-macro = { path = "packet-processor-macro" } packet-processor = { path = "packet-processor" } diff --git a/README.md b/README.md index 126abab..35d956e 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Also you'll need to install Rust. ## Preparing the workplace -Clone / download and unzip all project repositories (`proto`, `mhycrypt`, `RustySamovar`, `kcp`, `lua_serde`) into the same directory. +Clone repository with `git clone --recurse-submodules `. This is required to initialize all submodules. ## Retrieving protocol definitions diff --git a/kcp b/kcp new file mode 160000 index 0000000..1b8ded3 --- /dev/null +++ b/kcp @@ -0,0 +1 @@ +Subproject commit 1b8ded3cac58db18f8459298e1fbf7d55d5310ef diff --git a/lua_serde b/lua_serde new file mode 160000 index 0000000..ab15441 --- /dev/null +++ b/lua_serde @@ -0,0 +1 @@ +Subproject commit ab1544174d96ac0fbd4a78e7fa3af488b563b97a diff --git a/mhycrypt b/mhycrypt new file mode 160000 index 0000000..230a4e0 --- /dev/null +++ b/mhycrypt @@ -0,0 +1 @@ +Subproject commit 230a4e03e60c6d20c31f873911e285ca0222c49f diff --git a/packet-processor/Cargo.toml b/packet-processor/Cargo.toml index ba62de7..eb26f2d 100644 --- a/packet-processor/Cargo.toml +++ b/packet-processor/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proto = { path = "../../proto" } +proto = { path = "../proto" } prost = "0.8" diff --git a/proto b/proto new file mode 160000 index 0000000..2c10e95 --- /dev/null +++ b/proto @@ -0,0 +1 @@ +Subproject commit 2c10e95978ad7c291bbc919044870f7e627f35ff