feat: it works

Author: sstadick

crates/pixi-build-mojo/src/build_script.j2

@@ -4,10 +4,21 @@
 {% endmacro -%}
 
 {# - Set up common variables -#}
-{%- set build_dir = "build" -%}
-{%- set source_dir = env("SRC_DIR") -%}
 {%- set library_prefix =  "%LIBRARY_PREFIX%" if build_platform == "windows" else "$PREFIX" -%}
 
 mojo --version
+mkdir -p {{ source_dir }}/{{ dist }}
 
-mojo  {{ extra_args | join(" ") }} -o {{ library_prefix }}/main
+{#- Build any binaries -#}
+{% if bins %}
+	{% for bin in bins %}
+		mojo build {{ bin.extra_args | join(" ")  }} {{ bin.path }} -o {{ library_prefix }}/{{ bin.name }}
+		cp {{ library_prefix }}/{{ bin.name }} {{ source_dir }}/{{ dist }}
+	{% endfor %}
+{% endif %}
+
+{#- Build pkg -#}
+{% if pkg %}
+	mojo package {{ pkg.extra_args | join(" ") }} {{ pkg.path }} -o {{ library_prefix }}/{{ pkg.name}}.mojopkg
+	cp {{ library_prefix }}/{{ pkg.name }}.mojopkg {{ source_dir }}/{{ dist }}
+{% endif %}

crates/pixi-build-mojo/src/build_script.rs

@@ -1,18 +1,28 @@
+use super::config::{MojoBinConfig, MojoPkgConfig};
 use minijinja::Environment;
 use serde::Serialize;
 
-#[derive(Serialize)]
+#[derive(Debug, Serialize)]
 pub struct BuildScriptContext {
+    /// The platform that the build is taking place on.
     pub build_platform: BuildPlatform,
+    /// The directory where the source code is located, the manifest root.
     pub source_dir: String,
-    pub extra_args: Vec<String>,
+    /// The directory name to place output artifacts, will be created in `source_dir`.
+    pub dist: String,
+    /// Any executable artifacts to create.
+    pub bins: Option<Vec<MojoBinConfig>>,
+    /// Any packages to create.
+    pub pkg: Option<MojoPkgConfig>,
+
+    /// Not currenlty used
     /// The package has a host dependency on Python.
     /// This is used to determine if the build script
     /// should include Python-related logic.
     pub has_host_python: bool,
 }
 
-#[derive(Serialize)]
+#[derive(Debug, Serialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum BuildPlatform {
     Unix,

crates/pixi-build-mojo/src/config.rs

@@ -2,19 +2,29 @@ use std::path::{Path, PathBuf};
 
 use indexmap::IndexMap;
 use pixi_build_backend::generated_recipe::BackendConfig;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Default, Deserialize)]
+#[derive(Debug, Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct MojoBackendConfig {
-    /// Extra args for mojo invocation
-    #[serde(default)]
-    pub extra_args: Vec<String>,
     /// Environment Variables
     #[serde(default)]
     pub env: IndexMap<String, String>,
 
+    /// Directory that will be created to place output artifacts.
+    ///
+    /// This is releative to the manifest dir.
+    #[serde(default = "default_dist_dir")]
+    pub dist_dir: PathBuf,
+
+    /// Dir that can be specified for outputting pixi debug state.
     pub debug_dir: Option<PathBuf>,
+
+    /// Binary executables to produce.
+    pub bins: Option<Vec<MojoBinConfig>>,
+
+    /// Packages to produce.
+    pub pkg: Option<MojoPkgConfig>,
 }
 
 impl BackendConfig for MojoBackendConfig {
@@ -23,6 +33,44 @@ impl BackendConfig for MojoBackendConfig {
     }
 }
 
+impl Default for MojoBackendConfig {
+    fn default() -> Self {
+        Self {
+            env: Default::default(),
+            dist_dir: default_dist_dir(),
+            debug_dir: Default::default(),
+            bins: Default::default(),
+            pkg: Default::default(),
+        }
+    }
+}
+
+fn default_dist_dir() -> PathBuf {
+    PathBuf::from("target")
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct MojoBinConfig {
+    pub name: String,
+    pub path: String,
+    #[serde(default, rename(serialize = "extra_args"))]
+    pub extra_args: Option<Vec<String>>,
+    #[serde(default)]
+    pub env: IndexMap<String, String>,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct MojoPkgConfig {
+    pub name: String,
+    pub path: String,
+    #[serde(default, rename(serialize = "extra_args"))]
+    pub extra_args: Option<Vec<String>>,
+    #[serde(default)]
+    pub env: IndexMap<String, String>,
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::json;

crates/pixi-build-mojo/src/main.rs

@@ -49,13 +49,14 @@ impl GenerateRecipe for MojoGenerator {
                 .build
                 .push(mojo_compiler_pkg.parse().into_diagnostic()?);
         }
-        eprintln!("resolved compiler");
 
         // Check if the host platform has a host python dependency
         // TODO: surely this will be needed for compiling bindings or something? or maybe those
         // will be handled by uv?
         let has_host_python = resolved_requirements.contains(&PackageName::new_unchecked("python"));
 
+        // TODO: have different build scripts based on configuration?
+
         let build_script = BuildScriptContext {
             build_platform: if build_platform.is_windows() {
                 return Err(Error::msg(
@@ -65,18 +66,18 @@ impl GenerateRecipe for MojoGenerator {
                 BuildPlatform::Unix
             },
             source_dir: manifest_root.display().to_string(),
-            extra_args: config.extra_args.clone(),
+            dist: config.dist_dir.display().to_string(),
+            bins: config.bins.clone(),
+            pkg: config.pkg.clone(),
             has_host_python,
         }
         .render();
-        eprintln!("rendered build script");
 
         generated_recipe.recipe.build.script = Script {
             content: build_script,
             env: config.env.clone(),
             ..Default::default()
         };
-        eprintln!("Recipe script created");
 
         Ok(generated_recipe)
     }