From 920232be4cb70011d6922c20a32e68a7fec47e15 Mon Sep 17 00:00:00 2001 From: junderw Date: Fri, 23 Jun 2023 22:07:43 -0700 Subject: [PATCH] Use Cargo workspace Cargo workspace in the root will help make the IDE experience universal. Cargo.lock and the target directory for build artifacts will be in the root of the mempool repository (with ./target ignored by git). --- .gitignore | 1 + .vscode/settings.json | 5 +---- backend/rust-gbt/Cargo.lock => Cargo.lock | 0 Cargo.toml | 4 ++++ backend/rust-gbt/.gitignore | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) rename backend/rust-gbt/Cargo.lock => Cargo.lock (100%) create mode 100644 Cargo.toml diff --git a/.gitignore b/.gitignore index b41b0db08..4f19f2522 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ backend/mempool-config.json *.swp frontend/src/resources/config.template.js frontend/src/resources/config.js +target diff --git a/.vscode/settings.json b/.vscode/settings.json index 8ff18083a..692791184 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,5 @@ { "editor.tabSize": 2, "typescript.preferences.importModuleSpecifier": "relative", - "typescript.tsdk": "./backend/node_modules/typescript/lib", - "rust-analyzer.linkedProjects": [ - "./backend/rust-gbt/Cargo.toml" - ] + "typescript.tsdk": "./backend/node_modules/typescript/lib" } \ No newline at end of file diff --git a/backend/rust-gbt/Cargo.lock b/Cargo.lock similarity index 100% rename from backend/rust-gbt/Cargo.lock rename to Cargo.lock diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 000000000..e682bbcbc --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,4 @@ +[workspace] +members = [ + "./backend/rust-gbt", +] \ No newline at end of file diff --git a/backend/rust-gbt/.gitignore b/backend/rust-gbt/.gitignore index 6ca71fb5f..17ca706a8 100644 --- a/backend/rust-gbt/.gitignore +++ b/backend/rust-gbt/.gitignore @@ -1,4 +1,3 @@ -target index.node **/node_modules **/.DS_Store