fix windows

Author: timon-schelling

tools/building/src/lib.rs

@@ -1,7 +1,8 @@
-pub mod deps;
-
+use std::path::PathBuf;
 use std::process;
 
+pub mod deps;
+
 pub enum Target {
 	Web,
 	Desktop,
@@ -54,19 +55,22 @@ pub fn run(command: &str) -> Result<(), Error> {
 	run_from(command, None)
 }
 
-pub fn run_in_frontend_dir(command: &str) -> Result<(), Error> {
-	run_from(command, Some("frontend"))
+pub fn npm_run_in_frontend_dir(args: &str) -> Result<(), Error> {
+	let workspace_dir = std::path::PathBuf::from(env!("CARGO_WORKSPACE_DIR"));
+	let frontend_dir = workspace_dir.join("frontend");
+	let npm = if cfg!(target_os = "windows") { "npm.cmd" } else { "npm" };
+	run_from(&format!("{npm} run {args}"), Some(&frontend_dir))
 }
 
-pub fn run_from(command: &str, dir: Option<&str>) -> Result<(), Error> {
-	let workspace_dir = std::path::PathBuf::from(env!("CARGO_WORKSPACE_DIR"));
-	let dir = if let Some(dir) = dir { workspace_dir.join(dir) } else { workspace_dir };
+fn run_from(command: &str, dir: Option<&PathBuf>) -> Result<(), Error> {
 	let command = command.split_whitespace().collect::<Vec<_>>();
 	let mut cmd = process::Command::new(command[0]);
 	if command.len() > 1 {
 		cmd.args(&command[1..]);
 	}
-	cmd.current_dir(dir);
+	if let Some(dir) = dir {
+		cmd.current_dir(dir);
+	}
 	let exit_code = cmd
 		.spawn()
 		.map_err(|e| Error::Io(e, format!("Failed to spawn command '{}'", command.join(" "))))?

tools/building/src/main.rs

@@ -35,33 +35,33 @@ fn run_task(task: &Task) -> Result<(), Error> {
 	deps::check(task)?;
 
 	match (&task.target, &task.action, &task.profile) {
-		(Target::Web, Action::Run, Profile::Debug | Profile::Default) => run_in_frontend_dir("npm run start")?,
-		(Target::Web, Action::Run, Profile::Release) => run_in_frontend_dir("npm run production")?,
-		(Target::Web, Action::Run, Profile::Profiling) => run_in_frontend_dir("npm run profiling")?,
+		(Target::Web, Action::Run, Profile::Debug | Profile::Default) => npm_run_in_frontend_dir("start")?,
+		(Target::Web, Action::Run, Profile::Release) => npm_run_in_frontend_dir("production")?,
+		(Target::Web, Action::Run, Profile::Profiling) => npm_run_in_frontend_dir("profiling")?,
 
-		(Target::Web, Action::Build, Profile::Debug) => run_in_frontend_dir("npm run build-dev")?,
-		(Target::Web, Action::Build, Profile::Release | Profile::Default) => run_in_frontend_dir("npm run build")?,
-		(Target::Web, Action::Build, Profile::Profiling) => run_in_frontend_dir("npm run build-profiling")?,
+		(Target::Web, Action::Build, Profile::Debug) => npm_run_in_frontend_dir("build-dev")?,
+		(Target::Web, Action::Build, Profile::Release | Profile::Default) => npm_run_in_frontend_dir("build")?,
+		(Target::Web, Action::Build, Profile::Profiling) => npm_run_in_frontend_dir("build-profiling")?,
 
 		(Target::Desktop, Action::Run, Profile::Debug | Profile::Default) => {
-			run_in_frontend_dir("npm run build-native-dev")?;
+			npm_run_in_frontend_dir("build-native-dev")?;
 			run("cargo run -p third-party-licenses --features desktop")?;
 			run("cargo run -p graphite-desktop-bundle -- open")?;
 		}
 		(Target::Desktop, Action::Run, Profile::Release) => {
-			run_in_frontend_dir("npm run build-native")?;
+			npm_run_in_frontend_dir("build-native")?;
 			run("cargo run -p third-party-licenses --features desktop")?;
 			run("cargo run -r -p graphite-desktop-bundle -- open")?;
 		}
 		(Target::Desktop, Action::Run, Profile::Profiling) => todo!("profiling run for desktop"),
 
 		(Target::Desktop, Action::Build, Profile::Debug) => {
-			run_in_frontend_dir("npm run build-native-dev")?;
+			npm_run_in_frontend_dir("build-native-dev")?;
 			run("cargo run -p third-party-licenses --features desktop")?;
 			run("cargo run -p graphite-desktop-bundle")?;
 		}
 		(Target::Desktop, Action::Build, Profile::Release | Profile::Default) => {
-			run_in_frontend_dir("npm run build-native")?;
+			npm_run_in_frontend_dir("build-native")?;
 			run("cargo run -p third-party-licenses --features desktop")?;
 			run("cargo run -r -p graphite-desktop-bundle")?;
 		}