refactor: restructure monorepo, rename bevy_api_gen to bevy_mod_scripting_codegen

Cargo.toml

@@ -123,7 +123,7 @@ members = [
     "crates/bevy_system_reflection",
 ]
 resolver = "2"
-exclude = ["crates/bevy_api_gen", "crates/macro_tests", "xtask"]
+exclude = ["codegen", "crates/macro_tests", "xtask"]
 
 [profile.dev]
 debug = 1

crates/bevy_api_gen/Cargo.toml → codegen/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "bevy_api_gen"
+name = "bevy_mod_scripting_codegen"
 version = "0.6.0"
 edition = "2024"
 description = "Code generator tool for bevy"
@@ -15,12 +15,15 @@ include = [
     "rust-toolchain.toml",
 ]
 
+[workspace]
+members = []
+
 [[bin]]
-name = "cargo-bevy-api-gen"
+name = "cargo-bms-codegen"
 path = "src/bin/main.rs"
 
 [[bin]]
-name = "bevy-api-gen-driver"
+name = "bms-codegen-driver"
 path = "src/bin/driver.rs"
 
 [profile.ephemeral-build]

crates/bevy_api_gen/src/args.rs → codegen/src/args.rs

@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
     about,
     long_about,
     disable_help_flag = true,
-    bin_name = "cargo bevy-api-gen",
+    bin_name = "cargo bms-codegen",
     arg_required_else_help = true
 )]
 /// A Cargo plugin which can generate reflection powered wrappers for Bevy types,

crates/bevy_api_gen/src/bin/driver.rs → codegen/src/bin/driver.rs

@@ -1,5 +1,5 @@
 #![feature(rustc_private)]
-use bevy_api_gen::{driver::driver_main, *};
+use bevy_mod_scripting_codegen::{driver::driver_main, *};
 
 fn main() {
     // initially set it to high so no logs are missed, but later when we parse the args we will set it to the correct level

crates/bevy_api_gen/src/bin/main.rs → codegen/src/bin/main.rs

@@ -8,7 +8,7 @@ use std::{
     process::{Command, Stdio},
 };
 
-use bevy_api_gen::*;
+use bevy_mod_scripting_codegen::*;
 use cargo_metadata::camino::{Utf8Path, Utf8PathBuf};
 use clap::Parser;
 use log::{debug, error, info};
@@ -87,7 +87,7 @@ fn main() {
     workspace_meta.set_env();
 
     match args.cmd {
-        bevy_api_gen::Command::Print { template } => {
+        bevy_mod_scripting_codegen::Command::Print { template } => {
             println!(
                 "{}",
                 TEMPLATE_DIR
@@ -98,13 +98,13 @@ fn main() {
             );
             return;
         }
-        bevy_api_gen::Command::ListTemplates => {
+        bevy_mod_scripting_codegen::Command::ListTemplates => {
             for template in TemplateKind::VARIANTS {
                 println!("{template}");
             }
             return;
         }
-        bevy_api_gen::Command::Collect {
+        bevy_mod_scripting_codegen::Command::Collect {
             output,
             templates,
             api_name,
@@ -317,7 +317,7 @@ fn process_artifact(
 }
 
 /// finds best location for bootstrapping crate
-/// this will be the nearest target/bevy_api_gen_bootstrap directory
+/// this will be the nearest target/bms_codegen_bootstrap directory
 fn find_bootstrap_dir() -> PathBuf {
     let mut path = env::current_dir().unwrap();
     loop {
@@ -331,7 +331,7 @@ fn find_bootstrap_dir() -> PathBuf {
     }
 
     path.push("target");
-    path.push("bevy_api_gen_bootstrap");
+    path.push("bms_codegen_bootstrap");
 
     // create all the directories
     create_dir_all(&path).unwrap();

crates/bevy_api_gen/src/plugin.rs → codegen/src/plugin.rs

@@ -18,7 +18,7 @@ impl crate::driver::RustcPlugin for BevyAnalyzer {
     }
 
     fn driver_name(&self) -> std::borrow::Cow<'static, str> {
-        "bevy-api-gen-driver".into()
+        "bms-codegen-driver".into()
     }
 
     fn args(&self, target_dir: &Utf8Path) -> RustcPluginArgs<crate::Args> {

xtask/src/main.rs

@@ -344,8 +344,11 @@ impl App {
                     arg.arg("--dont-update-ide");
                 }
             }
-            Xtasks::Build => {
+            Xtasks::Build { timings } => {
                 cmd.arg("build");
+                if timings {
+                    cmd.arg("--timings");
+                }
             }
             Xtasks::Check { ide_mode, kind } => {
                 cmd.arg("check");
@@ -625,7 +628,15 @@ enum Xtasks {
         dont_update_ide: bool,
     },
     /// Build the main workspace only
-    Build,
+    Build {
+        /// Emit cargo build timings
+        #[clap(
+            long,
+            default_value = "false",
+            help = "Emit cargo build timings via --timinigs"
+        )]
+        timings: bool,
+    },
     /// Build the main workspace, apply all prefferred lints
     Check {
         #[clap(
@@ -749,7 +760,7 @@ impl Xtasks {
         }
 
         match self {
-            Xtasks::Build => Self::build(app_settings),
+            Xtasks::Build { timings } => Self::build(timings, app_settings),
             Xtasks::Check { ide_mode, kind } => Self::check(app_settings, ide_mode, kind),
             Xtasks::Docs { open, no_rust_docs } => Self::docs(app_settings, open, no_rust_docs),
             Xtasks::Test { name, package } => Self::test(app_settings, package, name),
@@ -770,7 +781,7 @@ impl Xtasks {
                 for os in <CiOs as strum::VariantArray>::VARIANTS {
                     for row in output.iter() {
                         let step_should_run_on_main_os =
-                            matches!(row.subcmd, Xtasks::Build | Xtasks::Docs { .. });
+                            matches!(row.subcmd, Xtasks::Build { .. } | Xtasks::Docs { .. });
                         let is_coverage_step = row.global_args.coverage;
 
                         if !os.is_main_os() && step_should_run_on_main_os {
@@ -837,7 +848,7 @@ impl Xtasks {
 
     fn codegen_crate_dir(app_settings: &GlobalArgs) -> Result<std::path::PathBuf> {
         let workspace_dir = Self::workspace_dir(app_settings)?;
-        Ok(workspace_dir.join("crates").join("bevy_api_gen"))
+        Ok(workspace_dir.join("codegen"))
     }
 
     fn relative_workspace_dir<P: AsRef<Path>>(
@@ -915,7 +926,7 @@ impl Xtasks {
 
         args.push(command.to_owned());
 
-        if command != "fmt" && command != "bevy-api-gen" && command != "install" {
+        if command != "fmt" && command != "bms-codegen" && command != "install" {
             // fmt doesn't care about features, workspaces or profiles
             if command != "run" {
                 args.push("--workspace".to_owned());
@@ -978,13 +989,18 @@ impl Xtasks {
         }
     }
 
-    fn build(app_settings: GlobalArgs) -> Result<()> {
+    fn build(timings: bool, app_settings: GlobalArgs) -> Result<()> {
         // build workspace using the given features
+        let mut args = vec!["--all-targets", "--examples"];
+        if timings {
+            args.push("--timings");
+        }
+
         Self::run_workspace_command(
             &app_settings,
             "build",
             "Failed to build workspace",
-            vec!["--all-targets"],
+            args,
             None,
             false,
         )?;
@@ -1184,8 +1200,8 @@ impl Xtasks {
 
         Self::run_workspace_command(
             &bevy_repo_app_settings,
-            "bevy-api-gen",
-            "Failed to run bevy-api-gen generate",
+            "bms-codegen",
+            "Failed to run bms-codegen generate",
             vec![
                 "generate",
                 "--bms-core-path",
@@ -1205,8 +1221,8 @@ impl Xtasks {
         // collect
         Self::run_workspace_command(
             &bevy_repo_app_settings,
-            "bevy-api-gen",
-            "Failed to run bevy-api-gen generate",
+            "bms-codegen",
+            "Failed to run bms-codegen generate",
             vec![
                 "collect",
                 "--bms-core-path",
@@ -1755,7 +1771,7 @@ impl Xtasks {
             // replace args with powerset
             output.push(App {
                 global_args: default_args.clone().with_features(feature_set.clone()),
-                subcmd: Xtasks::Build,
+                subcmd: Xtasks::Build { timings: false },
             })
         }
 

xtask/templates/settings.json.tera

@@ -1,7 +1,7 @@
 {
     "rust-analyzer.rustc.source": "discover",
     "rust-analyzer.linkedProjects": [
-        "{{ dir }}/crates/bevy_api_gen/Cargo.toml",
+        "codegen/Cargo.toml",
         "Cargo.toml",
         "xtask/Cargo.toml"
     ],