feat(build): consume package.xml manifest for ROS (#4820)

Co-authored-by: nichmor <[email protected]>

Author: remimimimimi

.github/workflows/ci.yml

@@ -916,7 +916,8 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
-          repository: prefix-dev/pixi-build-testsuite
+          repository: nichmor/pixi-build-testsuite
+          ref: feat/change-manifest-path-to-path-in-pixi-build
 
       - name: Set up pixi
         uses: prefix-dev/setup-pixi@main
@@ -947,7 +948,8 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
-          repository: prefix-dev/pixi-build-testsuite
+          repository: nichmor/pixi-build-testsuite
+          ref: feat/change-manifest-path-to-path-in-pixi-build
 
       - name: Create Dev Drive
         run: ${{ github.workspace }}/.github/workflows/setup-dev-drive.ps1
@@ -985,7 +987,8 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
-          repository: prefix-dev/pixi-build-testsuite
+          repository: nichmor/pixi-build-testsuite
+          ref: feat/change-manifest-path-to-path-in-pixi-build
 
       - name: Set up pixi
         uses: prefix-dev/setup-pixi@main

Cargo.lock

@@ -619,6 +619,44 @@ pub struct BuildBuilder {
     pub args: build::Args,
 }
 
+impl BuildBuilder {
+    /// Set the target platform for the build
+    pub fn with_target_platform(mut self, platform: Platform) -> Self {
+        self.args.target_platform = platform;
+        self
+    }
+
+    /// Set the build platform for the build
+    pub fn with_build_platform(mut self, platform: Platform) -> Self {
+        self.args.build_platform = platform;
+        self
+    }
+
+    /// Set the output directory for built artifacts
+    pub fn with_output_dir(mut self, output_dir: impl Into<PathBuf>) -> Self {
+        self.args.output_dir = output_dir.into();
+        self
+    }
+
+    /// Set the build directory for incremental builds
+    pub fn with_build_dir(mut self, build_dir: impl Into<PathBuf>) -> Self {
+        self.args.build_dir = Some(build_dir.into());
+        self
+    }
+
+    /// Set whether to clean the build directory before building
+    pub fn with_clean(mut self, clean: bool) -> Self {
+        self.args.clean = clean;
+        self
+    }
+
+    /// Set the path to the package manifest or directory
+    pub fn with_path(mut self, path: impl Into<PathBuf>) -> Self {
+        self.args.path = Some(path.into());
+        self
+    }
+}
+
 impl IntoFuture for BuildBuilder {
     type Output = miette::Result<()>;
     type IntoFuture = Pin<Box<dyn Future<Output = Self::Output> + 'static>>;

crates/pixi/tests/integration_rust/common/builders.rs

@@ -13,7 +13,7 @@ use std::{
     str::FromStr,
 };
 
-use builders::{BuildBuilder, LockBuilder, SearchBuilder};
+use builders::{LockBuilder, SearchBuilder};
 use indicatif::ProgressDrawTarget;
 use miette::{Context, Diagnostic, IntoDiagnostic};
 use pixi_cli::LockFileUsageConfig;
@@ -46,8 +46,9 @@ use thiserror::Error;
 
 use self::builders::{HasDependencyConfig, RemoveBuilder};
 use crate::common::builders::{
-    AddBuilder, InitBuilder, InstallBuilder, ProjectChannelAddBuilder, ProjectChannelRemoveBuilder,
-    ProjectEnvironmentAddBuilder, TaskAddBuilder, TaskAliasBuilder, UpdateBuilder,
+    AddBuilder, BuildBuilder, InitBuilder, InstallBuilder, ProjectChannelAddBuilder,
+    ProjectChannelRemoveBuilder, ProjectEnvironmentAddBuilder, TaskAddBuilder, TaskAliasBuilder,
+    UpdateBuilder,
 };
 
 const DEFAULT_PROJECT_CONFIG: &str = r#"
@@ -682,17 +683,15 @@ impl PixiControl {
     pub fn build(&self) -> BuildBuilder {
         BuildBuilder {
             args: build::Args {
-                project_config: WorkspaceConfig {
-                    manifest_path: Some(self.manifest_path()),
-                    ..Default::default()
-                },
+                backend_override: Default::default(),
                 config_cli: Default::default(),
                 lock_and_install_config: Default::default(),
                 target_platform: rattler_conda_types::Platform::current(),
                 build_platform: rattler_conda_types::Platform::current(),
                 output_dir: PathBuf::from("."),
                 build_dir: None,
                 clean: false,
+                path: Some(self.manifest_path()),
             },
         }
     }

crates/pixi/tests/integration_rust/common/mod.rs

@@ -23,6 +23,7 @@ rattler_conda_types = { workspace = true }
 pixi_build_type_conversions = { workspace = true }
 pixi_build_types = { workspace = true }
 pixi_config = { workspace = true }
+pixi_consts = { workspace = true }
 pixi_manifest = { workspace = true }
 pixi_spec = { workspace = true }
 pixi_spec_containers = { workspace = true }

crates/pixi_build_discovery/Cargo.toml

@@ -9,6 +9,7 @@ use ordermap::OrderMap;
 use pixi_build_type_conversions::{to_project_model_v1, to_target_selector_v1};
 use pixi_build_types::{ProjectModelV1, TargetSelectorV1};
 use pixi_config::Config;
+use pixi_consts::consts::{RATTLER_BUILD_DIRS, RATTLER_BUILD_FILE_NAMES, ROS_BACKEND_FILE_NAMES};
 use pixi_manifest::{
     DiscoveryStart, ExplicitManifestError, PackageManifest, PrioritizedChannel, WithProvenance,
     WorkspaceDiscoverer, WorkspaceDiscoveryError, WorkspaceManifest,
@@ -23,10 +24,6 @@ use crate::{
     backend_spec::{CommandSpec, EnvironmentSpec, JsonRpcBackendSpec},
 };
 
-const RATTLER_BUILD_FILE_NAMES: [&str; 2] = ["recipe.yaml", "recipe.yml"];
-const RATTLER_BUILD_DIRS: [&str; 2] = ["", "recipe"];
-const ROS_BACKEND_FILE_NAMES: [&str; 1] = ["package.xml"];
-
 /// Describes a backend discovered for a given source location.
 #[derive(Debug, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
@@ -118,9 +115,12 @@ pub enum DiscoveryError {
 
     #[error("the source directory '{0}', does not contain a supported manifest")]
     #[diagnostic(help(
-        "Ensure that the source directory contains a valid pixi.toml or recipe.yaml file."
+        "Ensure that the source directory contains a valid pixi.toml, pyproject.toml, recipe.yaml, package.xml or mojoproject.toml file."
     ))]
     FailedToDiscover(String),
+
+    #[error("the manifest path '{0}', does not have a parent directory")]
+    NoParentDir(PathBuf),
 }
 
 impl DiscoveredBackend {
@@ -327,14 +327,9 @@ impl DiscoveredBackend {
             ));
         };
 
-        Self::from_package_and_workspace(
-            // source_path,
-            &package_manifest,
-            &manifests.workspace,
-            channel_config,
-        )
-        .map_err(DiscoveryError::SpecConversionError)
-        .map(Some)
+        Self::from_package_and_workspace(&package_manifest, &manifests.workspace, channel_config)
+            .map_err(DiscoveryError::SpecConversionError)
+            .map(Some)
     }
 
     /// Try to discover a rattler build recipe in the repository.
@@ -376,7 +371,12 @@ impl DiscoveredBackend {
                 workspace_root: source_dir.clone(),
                 build_source: None,
                 source_anchor: source_dir,
-                manifest_path: package_xml_absolute_path,
+                manifest_path: package_xml_absolute_path
+                    .parent()
+                    .ok_or(DiscoveryError::NoParentDir(
+                        package_xml_absolute_path.clone(),
+                    ))?
+                    .to_path_buf(),
                 project_model: Some(ProjectModelV1::default()),
                 configuration: None,
                 target_configuration: None,

crates/pixi_build_discovery/src/discovery.rs

@@ -16,7 +16,7 @@ init-params:
   workspace-root: "file://<ROOT>/ros-package"
   build-source: ~
   source-anchor: "file://<ROOT>/ros-package"
-  manifest-path: "file://<ROOT>/ros-package/package.xml"
+  manifest-path: "file://<ROOT>/ros-package"
   project-model:
     name: ~
     version: ~