From 63d9201a77369f401bd89b6c1bd60c64af24633f Mon Sep 17 00:00:00 2001 From: Naja Melan Date: Tue, 22 Jan 2019 19:45:22 +0100 Subject: [PATCH] Initial project layout --- .gitignore | 1 + .gitmodules | 6 +++--- Cargo.toml | 9 +++++++++ apps/filebrowser | 2 +- ekke_core | 2 +- ekke_io | 1 + ekke_rpc | 1 - 7 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 Cargo.toml create mode 160000 ekke_io delete mode 160000 ekke_rpc diff --git a/.gitignore b/.gitignore index 088ba6b..5461a20 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk +resources diff --git a/.gitmodules b/.gitmodules index 0e3a062..c0f3d90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "ekke_rpc"] - path = ekke_rpc - url = git@github.com:najamelan/ekke_rpc.git [submodule "apps/filebrowser"] path = apps/filebrowser url = git@github.com:najamelan/ekke_filebrowser.git [submodule "ekke_core"] path = ekke_core url = git@github.com:najamelan/ekke_core.git +[submodule "ekke_io"] + path = ekke_io + url = git@github.com:najamelan/ekke_io.git diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..c0cc820 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,9 @@ +[workspace] + + members = [ + + "ekke_core", + "ekke_io", + "apps/filebrowser" + + ] diff --git a/apps/filebrowser b/apps/filebrowser index 6c265f2..dfa6914 160000 --- a/apps/filebrowser +++ b/apps/filebrowser @@ -1 +1 @@ -Subproject commit 6c265f29d9ca1ecdc42657efdaa02c2ae73cbdd9 +Subproject commit dfa69149df19490dc9e89decd8b11162146f2df3 diff --git a/ekke_core b/ekke_core index d17bae1..652864b 160000 --- a/ekke_core +++ b/ekke_core @@ -1 +1 @@ -Subproject commit d17bae14a123f26850973bb75748e397557fe02d +Subproject commit 652864b3fe4616984103625da3e2b5a6c9a53f36 diff --git a/ekke_io b/ekke_io new file mode 160000 index 0000000..31d870a --- /dev/null +++ b/ekke_io @@ -0,0 +1 @@ +Subproject commit 31d870a6a94db88b4558208b21750bd1f7c201a2 diff --git a/ekke_rpc b/ekke_rpc deleted file mode 160000 index 77df5e7..0000000 --- a/ekke_rpc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 77df5e7fc678de608bbaad33a254947c4a47b44f