From 6409e3eedf8c83803487119c3a9c3a1896daa9b8 Mon Sep 17 00:00:00 2001 From: Florian Briand Date: Thu, 4 Jul 2024 12:12:12 +0200 Subject: [PATCH 1/3] chore: Initialize cargo workspace members --- .gitignore | 6 ++---- Cargo.toml | 6 ++++++ clego/.gitkeep | 0 tauri/.gitkeep | 0 webapp/.gitkeep | 0 5 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 Cargo.toml create mode 100644 clego/.gitkeep create mode 100644 tauri/.gitkeep create mode 100644 webapp/.gitkeep diff --git a/.gitignore b/.gitignore index 3ca43ae..e22d768 100644 --- a/.gitignore +++ b/.gitignore @@ -4,13 +4,11 @@ debug/ target/ -# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries -# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html -Cargo.lock - # These are backup files generated by rustfmt **/*.rs.bk # MSVC Windows builds of rustc generate these, which store debugging information *.pdb +# IDEs and editors +.vscode diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..861b9f6 --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,6 @@ +[workspace] +members = [ + "frontoffice", + "clego", + "tauri", +] \ No newline at end of file diff --git a/clego/.gitkeep b/clego/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/tauri/.gitkeep b/tauri/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/webapp/.gitkeep b/webapp/.gitkeep new file mode 100644 index 0000000..e69de29 From 820d76d0f527a2089d19081b36aaff0d50c7a7ba Mon Sep 17 00:00:00 2001 From: Florian Briand Date: Fri, 5 Jul 2024 16:15:49 +0200 Subject: [PATCH 2/3] chore: Setup clego sub project --- clego/.gitkeep | 0 clego/Cargo.toml | 6 ++++++ clego/src/main.rs | 3 +++ 3 files changed, 9 insertions(+) delete mode 100644 clego/.gitkeep create mode 100644 clego/Cargo.toml create mode 100644 clego/src/main.rs diff --git a/clego/.gitkeep b/clego/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/clego/Cargo.toml b/clego/Cargo.toml new file mode 100644 index 0000000..495a5a2 --- /dev/null +++ b/clego/Cargo.toml @@ -0,0 +1,6 @@ +[package] +name = "clego" +version = "0.1.0" +edition = "2021" + +[dependencies] diff --git a/clego/src/main.rs b/clego/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/clego/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} From d9cedca33591dd15f523b7523869420b1a700271 Mon Sep 17 00:00:00 2001 From: Florian Briand Date: Sat, 6 Jul 2024 20:04:56 +0200 Subject: [PATCH 3/3] fixup! chore: Setup clego sub project --- Cargo.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 861b9f6..761d36a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [workspace] members = [ - "frontoffice", + "webapp", "clego", "tauri", -] \ No newline at end of file +] +resolver = "2"