From ef837232bc600922da1595b10d0e4020acd891e6 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Mon, 31 Oct 2022 13:25:12 -0700 Subject: [PATCH] Generate themes before compiling the 'assets' crate --- crates/assets/build.rs | 29 +++++++++++++++++++++++++++++ crates/zed/build.rs | 28 ---------------------------- 2 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 crates/assets/build.rs diff --git a/crates/assets/build.rs b/crates/assets/build.rs new file mode 100644 index 0000000000..8500b24622 --- /dev/null +++ b/crates/assets/build.rs @@ -0,0 +1,29 @@ +use std::process::Command; + +fn main() { + let output = Command::new("npm") + .current_dir("../../styles") + .args(["install", "--no-save"]) + .output() + .expect("failed to run npm"); + if !output.status.success() { + panic!( + "failed to install theme dependencies {}", + String::from_utf8_lossy(&output.stderr) + ); + } + + let output = Command::new("npm") + .current_dir("../../styles") + .args(["run", "build"]) + .output() + .expect("failed to run npm"); + if !output.status.success() { + panic!( + "build script failed {}", + String::from_utf8_lossy(&output.stderr) + ); + } + + println!("cargo:rerun-if-changed=../../styles/src"); +} diff --git a/crates/zed/build.rs b/crates/zed/build.rs index 9caa7776db..1f30e7ded2 100644 --- a/crates/zed/build.rs +++ b/crates/zed/build.rs @@ -1,5 +1,3 @@ -use std::process::Command; - fn main() { println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7"); @@ -26,30 +24,4 @@ fn main() { // Register exported Objective-C selectors, protocols, etc println!("cargo:rustc-link-arg=-Wl,-ObjC"); - - let output = Command::new("npm") - .current_dir("../../styles") - .args(["install", "--no-save"]) - .output() - .expect("failed to run npm"); - if !output.status.success() { - panic!( - "failed to install theme dependencies {}", - String::from_utf8_lossy(&output.stderr) - ); - } - - let output = Command::new("npm") - .current_dir("../../styles") - .args(["run", "build"]) - .output() - .expect("failed to run npm"); - if !output.status.success() { - panic!( - "build script failed {}", - String::from_utf8_lossy(&output.stderr) - ); - } - - println!("cargo:rerun-if-changed=../../styles/src"); }