rojo-rbx/rojo
1
0
Fork 1
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-04-26 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up build command further

Browse Source
This commit is contained in:
Lucien Greathouse
2021-06-08 16:50:21 -04:00
parent ffb2aa332a
commit 1413f8c0b6
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cli/build.rs
View File

@@ -9,7 +9,7 @@ use memofs::Vfs;
use structopt::StructOpt; use structopt::StructOpt;
use tokio::runtime::Runtime; use tokio::runtime::Runtime;
use crate::{serve_session::ServeSession, snapshot::RojoTree}; use crate::serve_session::ServeSession;
use super::resolve_path; use super::resolve_path;
@@ -47,10 +47,7 @@ impl BuildCommand {
let session = ServeSession::new(vfs, &project_path)?; let session = ServeSession::new(vfs, &project_path)?;
let mut cursor = session.message_queue().cursor(); let mut cursor = session.message_queue().cursor();
{ write_model(&session, &self.output, output_kind)?;
let tree = session.tree();
write_model(&tree, &self.output, output_kind)?;
}
if self.watch { if self.watch {
let mut rt = Runtime::new().unwrap(); let mut rt = Runtime::new().unwrap();
@@ -60,8 +57,7 @@ impl BuildCommand {
let (new_cursor, _patch_set) = rt.block_on(receiver).unwrap(); let (new_cursor, _patch_set) = rt.block_on(receiver).unwrap();
cursor = new_cursor; cursor = new_cursor;
let tree = session.tree(); write_model(&session, &self.output, output_kind)?;
write_model(&tree, &self.output, output_kind)?;
} }
} }
@@ -101,9 +97,14 @@ fn xml_encode_config() -> rbx_xml::EncodeOptions {
rbx_xml::EncodeOptions::new().property_behavior(rbx_xml::EncodePropertyBehavior::WriteUnknown) rbx_xml::EncodeOptions::new().property_behavior(rbx_xml::EncodePropertyBehavior::WriteUnknown)
} }
fn write_model(tree: &RojoTree, output: &Path, output_kind: OutputKind) -> anyhow::Result<()> { fn write_model(
println!("Building project..."); session: &ServeSession,
output: &Path,
output_kind: OutputKind,
) -> anyhow::Result<()> {
println!("Building project '{}'", session.project_name());
let tree = session.tree();
let root_id = tree.get_root_id(); let root_id = tree.get_root_id();
log::trace!("Opening output file for write"); log::trace!("Opening output file for write");