Prechádzať zdrojové kódy

Merge pull request #568 from tsuiyuenhong/feature/support_rust_debug_in_vscode

Support debugging rust in VS Code and Fix build problem in linux
Nathan.fooo 3 rokov pred
rodič
commit
619d2f52ec

+ 8 - 1
.gitignore

@@ -20,4 +20,11 @@ node_modules
 **/.DS_Store
 
 **/src/protobuf
-**/resources/proto
+**/resources/proto
+
+frontend/.vscode/*
+!frontend/.vscode/settings.json
+!frontend/.vscode/tasks.json
+!frontend/.vscode/launch.json
+!frontend/.vscode/extensions.json
+!frontend/.vscode/*.code-snippets

+ 6 - 0
frontend/.vscode/launch.json

@@ -16,6 +16,12 @@
             },
             "cwd": "${workspaceRoot}/app_flowy"
         },
+        {
+            "name": "AF: Debug Rust",
+            "request": "attach",
+            "type": "lldb",
+            "pid": "${command:pickMyProcess}"
+        },
         {
             //  This task only builds the Dart code of AppFlowy.
             "name": "AF: Build Dart Only",

+ 1 - 1
frontend/.vscode/tasks.json

@@ -49,7 +49,7 @@
 			"linux": {
 				"options": {
 					"env": {
-						"FLOWY_DEV_ENV": "Linux-x86"
+						"FLOWY_DEV_ENV": "Linux"
 					}
 				}
 			},

+ 2 - 6
frontend/scripts/build_sdk.sh

@@ -16,12 +16,8 @@ rustup show
 
 
 case "$FLOWY_DEV_ENV" in
-Linux-aarch64) 
- cargo make --profile development-linux-aarch64 flowy-sdk-dev
- ;;
-
-Linux-x86)
- cargo make --profile development-linux-x86 flowy-sdk-dev
+Linux) 
+ cargo make --profile "development-linux-$(uname -m)" flowy-sdk-dev
  ;;
 
 macOS)