Merge pull request #343 from AppFlowy-IO/fix_windows_build

appflowy · web-flow · commit 6593855f8fde · 2022-02-17T22:36:21.000+08:00
Fix windows build
diff --git a/frontend/.vscode/tasks.json b/frontend/.vscode/tasks.json
@@ -70,6 +70,27 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},
+		},
+		{
+			"label": "Clean",
+			"type": "shell",
+			"command": "sh ./scripts/clean.sh",
+			"windows": {
+				"options": {
+					"shell": {
+						"executable": "cmd.exe",
+						"args": [
+							"/d",
+							"/c",
+							".\\scripts\\clean.cmd"
+						]
+					}
+				}
+			},
+			"group": "build",
+			"options": {
+				"cwd": "${workspaceFolder}"
+			},
 		}
 	]
 }
diff --git a/frontend/app_flowy/.vscode/launch.json b/frontend/app_flowy/.vscode/launch.json
@@ -40,12 +40,5 @@
             "preLaunchTask": "Generate Language Files",
             "cwd": "${workspaceRoot}"
         },
-        {
-            "name": "Clean",
-            "request": "launch",
-            "type": "dart",
-            "preLaunchTask": "Clean",
-            "cwd": "${workspaceRoot}"
-        }
     ]
 }
diff --git a/frontend/app_flowy/.vscode/tasks.json b/frontend/app_flowy/.vscode/tasks.json
@@ -72,7 +72,7 @@
 			},
 		},
 		{
-			"label": "Clean FlowySDK",
+			"label": "Clean",
 			"type": "shell",
 			"command": "sh ./scripts/clean.sh",
 			"windows": {
@@ -87,7 +87,10 @@
 					}
 				}
 			},
-			"group": "build",
+			"group": {
+				"kind": "build",
+				"isDefault": true,
+			},
 			"options": {
 				"cwd": "${workspaceFolder}/../"
 			},
diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.toml
@@ -36,4 +36,4 @@ http_server = ["flowy-sdk/http_server", "flowy-sdk/use_bunyan"]
 #use_protobuf= ["protobuf"]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen", "dart"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen", "dart"] }
diff --git a/frontend/rust-lib/dart-notify/Cargo.toml b/frontend/rust-lib/dart-notify/Cargo.toml
@@ -19,4 +19,4 @@ lib-dispatch = {path = "../lib-dispatch" }
 dart = ["lib-infra/dart"]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }
diff --git a/frontend/rust-lib/flowy-error/Cargo.toml b/frontend/rust-lib/flowy-error/Cargo.toml
@@ -30,4 +30,4 @@ db = ["flowy-database", "lib-sqlite", "r2d2"]
 dart = ["flowy-error-code/dart", "lib-infra/dart"]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }
diff --git a/frontend/rust-lib/flowy-folder/Cargo.toml b/frontend/rust-lib/flowy-folder/Cargo.toml
@@ -56,4 +56,4 @@ flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-sync/flowy_unit_test"]
 dart = ["lib-infra/dart", "flowy-folder/dart", "flowy-folder/dart",]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen", "proto_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen", "proto_gen"] }
diff --git a/frontend/rust-lib/flowy-net/Cargo.toml b/frontend/rust-lib/flowy-net/Cargo.toml
@@ -50,4 +50,4 @@ dart = [
 ]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }
diff --git a/frontend/rust-lib/flowy-user/Cargo.toml b/frontend/rust-lib/flowy-user/Cargo.toml
@@ -48,4 +48,4 @@ http_server = []
 dart = ["lib-infra/dart"]
 
 [build-dependencies]
-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }
diff --git a/frontend/scripts/clean.cmd b/frontend/scripts/clean.cmd
@@ -4,4 +4,4 @@ cargo clean
 cd ../../shared-lib
 cargo clean
 
-rmdir /s/q lib-infra/.cache
+rmdir /s/q "lib-infra/.cache"
diff --git a/frontend/scripts/makefile/protobuf.toml b/frontend/scripts/makefile/protobuf.toml
@@ -1,5 +1,10 @@
 
 [tasks.install_protobuf]
+mac_alias = "install-protobuf"
+windows_alias = "install-protobuf-windows"
+linux_alias = "install-protobuf"
+
+[tasks.install-protobuf]
 condition_script = [
     """
     if ! command -v protoc-gen-dart
@@ -13,21 +18,8 @@ condition_script = [
 ]
 run_task = { name = ["install_protobuf_compiler"] }
 
-[tasks.install_protobuf_compiler]
-script = """
-echo "Install protoc_plugin (Dart)"
-dart pub global activate protoc_plugin
-"""
-script_runner = "@shell"
 
-[tasks.install_protobuf_compiler.linux]
-script = """
-echo "Install protoc_plugin (Dart)"
-dart pub global activate protoc_plugin
-"""
-script_runner = "@shell"
-
-[tasks.install_protobuf_compiler.windows]
+[tasks.install-protobuf-windows]
 script = """
 ret = which dart
 if is_empty ${ret}
@@ -44,6 +36,22 @@ end
 """
 script_runner = "@duckscript"
 
+
+[tasks.install_protobuf_compiler]
+script = """
+echo "Install protoc_plugin (Dart)"
+dart pub global activate protoc_plugin
+"""
+script_runner = "@shell"
+
+[tasks.install_protobuf_compiler.linux]
+script = """
+echo "Install protoc_plugin (Dart)"
+dart pub global activate protoc_plugin
+"""
+script_runner = "@shell"
+
+
 [tasks.check_protoc_cmd]
 script = [
     """
diff --git a/shared-lib/flowy-collaboration/Cargo.toml b/shared-lib/flowy-collaboration/Cargo.toml
@@ -29,7 +29,7 @@ futures = "0.3.15"
 async-stream = "0.3.2"
 
 [build-dependencies]
-lib-infra = { path = "../lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] }
 
 [features]
 dart = ["lib-infra/dart"]
diff --git a/shared-lib/flowy-error-code/Cargo.toml b/shared-lib/flowy-error-code/Cargo.toml
@@ -11,7 +11,7 @@ protobuf = {version = "2.18.0"}
 derive_more = {version = "0.99", features = ["display"]}
 
 [build-dependencies]
-lib-infra = { path = "../lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] }
 
 [features]
 dart = ["lib-infra/dart"]
diff --git a/shared-lib/flowy-folder-data-model/Cargo.toml b/shared-lib/flowy-folder-data-model/Cargo.toml
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 [build-dependencies]
-lib-infra = { path = "../lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] }
 
 [features]
 default = []
diff --git a/shared-lib/flowy-user-data-model/Cargo.toml b/shared-lib/flowy-user-data-model/Cargo.toml
@@ -19,7 +19,7 @@ fancy-regex = "0.5.0"
 lazy_static = "1.4"
 
 [build-dependencies]
-lib-infra = { path = "../lib-infra", features = ["pb_gen"] }
+lib-infra = { path = "../lib-infra", features = ["protobuf_file_gen"] }
 
 [dev-dependencies]
 quickcheck = "0.9.2"
diff --git a/shared-lib/lib-infra/Cargo.toml b/shared-lib/lib-infra/Cargo.toml
@@ -47,6 +47,6 @@ proto_gen = [
     "console",
     "toml"
 ]
-pb_gen = ["cmd_lib", "protoc-rust", "walkdir", "protoc-bin-vendored",]
+protobuf_file_gen = ["cmd_lib", "protoc-rust", "walkdir", "protoc-bin-vendored",]
 dart_event = ["walkdir", "flowy-ast", "tera", "syn"]
 dart = ["proto_gen", "dart_event"]
diff --git a/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs b/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs
@@ -1,10 +1,10 @@
 use super::event_template::*;
 use crate::code_gen::flowy_toml::{parse_crate_config_from, CrateConfig};
-use crate::code_gen::util::{cache_dir, is_crate_dir, is_hidden, read_file};
+use crate::code_gen::util::{is_crate_dir, is_hidden, path_string_with_component, read_file};
 use flowy_ast::{event_ast::*, *};
 use std::fs::File;
 use std::io::Write;
-use std::path::Path;
+use std::path::PathBuf;
 use syn::Item;
 use walkdir::WalkDir;
 
@@ -33,18 +33,22 @@ pub fn gen(crate_name: &str) {
         }
     }
 
-    let dart_event_folder = format!(
-        "{}/{}/lib/dispatch/dart_event/{}",
-        std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap(),
-        std::env::var("FLUTTER_FLOWY_SDK_PATH").unwrap(),
-        crate_name
-    );
-
-    if !Path::new(&dart_event_folder).exists() {
-        std::fs::create_dir_all(&dart_event_folder).unwrap();
+    let dart_event_folder: PathBuf = [
+        &std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap(),
+        &std::env::var("FLUTTER_FLOWY_SDK_PATH").unwrap(),
+        "lib",
+        "dispatch",
+        "dart_event",
+        crate_name,
+    ]
+    .iter()
+    .collect();
+
+    if !dart_event_folder.as_path().exists() {
+        std::fs::create_dir_all(dart_event_folder.as_path()).unwrap();
     }
 
-    let dart_event_file_path = format!("{}/dart_event.dart", dart_event_folder);
+    let dart_event_file_path = path_string_with_component(&dart_event_folder, vec!["dart_event.dart"]);
     println!("cargo:rerun-if-changed={}", dart_event_file_path);
 
     match std::fs::OpenOptions::new()
@@ -69,39 +73,9 @@ const DART_IMPORTED: &str = r#"
 part of '../../dispatch.dart';
 "#;
 
-pub fn write_dart_event_file(file_path: &str) {
-    let cache_dir = cache_dir();
-    let mut content = DART_IMPORTED.to_owned();
-    for path in WalkDir::new(cache_dir)
-        .into_iter()
-        .filter_map(|e| e.ok())
-        .filter(|e| e.path().file_stem().unwrap().to_str().unwrap() == "dart_event")
-        .map(|e| e.path().to_str().unwrap().to_string())
-    {
-        let file_content = read_file(path.as_ref()).unwrap();
-        content.push_str(&file_content);
-    }
-
-    match std::fs::OpenOptions::new()
-        .create(true)
-        .write(true)
-        .append(false)
-        .truncate(true)
-        .open(&file_path)
-    {
-        Ok(ref mut file) => {
-            file.write_all(content.as_bytes()).unwrap();
-            File::flush(file).unwrap();
-        }
-        Err(err) => {
-            panic!("Failed to write dart event file: {}", err);
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct DartEventCrate {
-    crate_path: String,
+    crate_path: PathBuf,
     event_files: Vec<String>,
 }
 
@@ -135,7 +109,8 @@ pub fn parse_event_crate(event_crate: &DartEventCrate) -> Vec<EventASTContext> {
         .event_files
         .iter()
         .map(|event_file| {
-            let file_path = format!("{}/{}", event_crate.crate_path, event_file);
+            let file_path = path_string_with_component(&event_crate.crate_path, vec![event_file.as_str()]);
+
             let file_content = read_file(file_path.as_ref()).unwrap();
             let ast = syn::parse_file(file_content.as_ref()).expect("Unable to parse file");
             ast.items
diff --git a/shared-lib/lib-infra/src/code_gen/flowy_toml.rs b/shared-lib/lib-infra/src/code_gen/flowy_toml.rs
@@ -1,4 +1,6 @@
+use crate::code_gen::util::path_buf_with_component;
 use std::fs;
+use std::path::{Path, PathBuf};
 
 #[derive(serde::Deserialize)]
 pub struct FlowyConfig {
@@ -7,42 +9,40 @@ pub struct FlowyConfig {
 }
 
 impl FlowyConfig {
-    pub fn from_toml_file(path: &str) -> Self {
+    pub fn from_toml_file(path: &Path) -> Self {
         let content = fs::read_to_string(path).unwrap();
         let config: FlowyConfig = toml::from_str(content.as_ref()).unwrap();
         config
     }
 }
 
 pub struct CrateConfig {
-    pub crate_path: String,
+    pub crate_path: PathBuf,
     pub folder_name: String,
     pub flowy_config: FlowyConfig,
 }
 
 impl CrateConfig {
-    pub fn proto_paths(&self) -> Vec<String> {
+    pub fn proto_paths(&self) -> Vec<PathBuf> {
         let proto_paths = self
             .flowy_config
             .proto_crates
             .iter()
-            .map(|name| format!("{}/{}", self.crate_path, name))
-            .collect::<Vec<String>>();
+            .map(|name| path_buf_with_component(&self.crate_path, vec![&name]))
+            .collect::<Vec<PathBuf>>();
         proto_paths
     }
 }
 
 pub fn parse_crate_config_from(entry: &walkdir::DirEntry) -> Option<CrateConfig> {
-    let path = entry.path().parent().unwrap();
-    let crate_path = path.to_str().unwrap().to_string();
-    let folder_name = path.file_stem().unwrap().to_str().unwrap().to_string();
-    let config_path = format!("{}/Flowy.toml", crate_path);
-
-    if !std::path::Path::new(&config_path).exists() {
+    let mut config_path = entry.path().parent().unwrap().to_path_buf();
+    config_path.push("Flowy.toml");
+    if !config_path.as_path().exists() {
         return None;
     }
-
-    let flowy_config = FlowyConfig::from_toml_file(config_path.as_ref());
+    let crate_path = entry.path().parent().unwrap().to_path_buf();
+    let flowy_config = FlowyConfig::from_toml_file(config_path.as_path());
+    let folder_name = crate_path.file_stem().unwrap().to_str().unwrap().to_string();
 
     Some(CrateConfig {
         crate_path,
diff --git a/shared-lib/lib-infra/src/code_gen/mod.rs b/shared-lib/lib-infra/src/code_gen/mod.rs
@@ -1,13 +1,13 @@
-#[cfg(feature = "pb_gen")]
+#[cfg(feature = "protobuf_file_gen")]
 pub mod protobuf_file;
 
 #[cfg(feature = "dart_event")]
 pub mod dart_event;
 
-#[cfg(any(feature = "pb_gen", feature = "dart_event"))]
+#[cfg(any(feature = "protobuf_file_gen", feature = "dart_event"))]
 mod flowy_toml;
 
-#[cfg(any(feature = "pb_gen", feature = "dart_event"))]
+#[cfg(any(feature = "protobuf_file_gen", feature = "dart_event"))]
 pub mod util;
 
 #[derive(serde::Serialize, serde::Deserialize)]
diff --git a/shared-lib/lib-infra/src/code_gen/protobuf_file/ast.rs b/shared-lib/lib-infra/src/code_gen/protobuf_file/ast.rs
diff --git a/shared-lib/lib-infra/src/code_gen/protobuf_file/mod.rs b/shared-lib/lib-infra/src/code_gen/protobuf_file/mod.rs
diff --git a/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs b/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs
diff --git a/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_info.rs b/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_info.rs
diff --git a/shared-lib/lib-infra/src/code_gen/util.rs b/shared-lib/lib-infra/src/code_gen/util.rs
diff --git a/shared-lib/lib-ws/Cargo.toml b/shared-lib/lib-ws/Cargo.toml

Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,5 @@`
`40`	`40`	`"preLaunchTask": "Generate Language Files",`
`41`	`41`	`"cwd": "${workspaceRoot}"`
`42`	`42`	`},`
`43`		`- {`
`44`		`- "name": "Clean",`
`45`		`- "request": "launch",`
`46`		`- "type": "dart",`
`47`		`- "preLaunchTask": "Clean",`
`48`		`- "cwd": "${workspaceRoot}"`
`49`		`- }`
`50`	`43`	`]`
`51`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@ dart = [`
`50`	`50`	`]`
`51`	`51`
`52`	`52`	`[build-dependencies]`
`53`		`-lib-infra = { path = "../../../shared-lib/lib-infra", features = ["pb_gen"] }`
	`53`	`+lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen"] }`