Add flags to pass through features to cargo

src/commands/package.rs

@@ -12,13 +12,13 @@ use execute::{command, Execute};
 use indicatif::MultiProgress;
 
 use crate::bindings::generate_bindings;
+use crate::console::*;
 use crate::console::{run_step, run_step_with_commands};
 use crate::lib_type::LibType;
 use crate::metadata::{metadata, MetadataExt};
 use crate::swiftpackage::{create_swiftpackage, recreate_output_dir};
 use crate::targets::*;
 use crate::xcframework::create_xcframework;
-use crate::console::*;
 
 #[derive(ValueEnum, Debug, Clone)]
 #[value()]
@@ -48,13 +48,22 @@ impl From<LibTypeArg> for Option<LibType> {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct FeatureOptions {
+    pub features: Option<Vec<String>>,
+    pub all_features: bool,
+    pub no_default_features: bool,
+}
+
+#[allow(clippy::too_many_arguments)]
 pub fn run(
     platforms: Option<Vec<Platform>>,
     package_name: Option<String>,
     disable_warnings: bool,
     config: Config,
     mode: Mode,
     lib_type_arg: LibTypeArg,
+    features: FeatureOptions,
     skip_toolchains_check: bool,
 ) -> Result<()> {
     // TODO: Allow path as optional argument to take other directories than current directory
@@ -72,6 +81,7 @@ pub fn run(
             &config,
             mode,
             lib_type_arg,
+            features,
             skip_toolchains_check,
         );
     } else if package_name.is_some() {
@@ -90,6 +100,7 @@ pub fn run(
                 &config,
                 mode,
                 lib_type_arg.clone(),
+                features.clone(),
                 skip_toolchains_check,
             )
         })
@@ -107,6 +118,7 @@ fn run_for_crate(
     config: &Config,
     mode: Mode,
     lib_type_arg: LibTypeArg,
+    features: FeatureOptions,
     skip_toolchains_check: bool,
 ) -> Result<()> {
     let lib = current_crate
@@ -123,7 +135,7 @@ fn run_for_crate(
 
     if lib_type == LibType::Dynamic {
         warning!(
-            &config, 
+            &config,
             "Building as dynamic library is discouraged. It might prevent apps that use this library from publishing to the App Store."
         );
     }
@@ -157,7 +169,7 @@ fn run_for_crate(
 
     let crate_name = lib.name.replace('-', "_");
     for target in &targets {
-        build_with_output(target, &crate_name, mode, lib_type, config)?;
+        build_with_output(target, &crate_name, mode, lib_type, config, &features)?;
     }
 
     generate_bindings_with_output(&targets, &crate_name, mode, lib_type, config)?;
@@ -372,8 +384,9 @@ fn build_with_output(
     mode: Mode,
     lib_type: LibType,
     config: &Config,
+    features: &FeatureOptions,
 ) -> Result<()> {
-    let mut commands = target.commands(lib_name, mode, lib_type);
+    let mut commands = target.commands(lib_name, mode, lib_type, features);
     for command in &mut commands {
         command.env("CARGO_TERM_COLOR", "always");
     }

src/lib.rs

@@ -31,9 +31,9 @@ mod targets;
 mod templating;
 mod xcframework;
 
-pub use commands::*;
 pub use crate::console::error::Result;
 pub use crate::console::Config;
+pub use commands::*;
 pub use lib_type::LibType;
 pub use targets::*;
 

src/main.rs

@@ -1,6 +1,10 @@
 use std::process::ExitCode;
 
-use cargo_swift::{init, package, Config, LibType, Mode};
+use cargo_swift::{
+    init,
+    package::{self, FeatureOptions},
+    Config, LibType, Mode,
+};
 use clap::{Parser, Subcommand};
 
 #[derive(Parser)]
@@ -88,6 +92,15 @@ enum Action {
         #[arg(long)]
         /// Disable toolchains check
         skip_toolchains_check: bool,
+
+        #[arg(short = 'F', long, trailing_var_arg = true)]
+        features: Option<Vec<String>>,
+
+        #[arg(long)]
+        all_features: bool,
+
+        #[arg(long)]
+        no_default_features: bool,
     },
 }
 
@@ -111,13 +124,21 @@ fn main() -> ExitCode {
             release,
             lib_type,
             skip_toolchains_check,
+            features,
+            all_features,
+            no_default_features,
         } => package::run(
             platforms,
             package_name,
             suppress_warnings,
             config,
             if release { Mode::Release } else { Mode::Debug },
             lib_type,
+            FeatureOptions {
+                features,
+                all_features,
+                no_default_features,
+            },
             skip_toolchains_check,
         ),
     };

src/targets.rs

@@ -5,6 +5,7 @@ use nonempty::{nonempty, NonEmpty};
 
 use crate::lib_type::LibType;
 use crate::metadata::{metadata, MetadataExt};
+use crate::package::FeatureOptions;
 
 pub trait TargetInfo {
     fn target(&self) -> Target;
@@ -41,15 +42,32 @@ impl Display for Mode {
 }
 
 impl Target {
-    fn cargo_build_commands(&self, mode: Mode) -> Vec<Command> {
-        let flag = match mode {
-            Mode::Debug => "",
-            Mode::Release => "--release",
-        };
-
+    fn cargo_build_commands(&self, mode: Mode, features: &FeatureOptions) -> Vec<Command> {
         self.architectures()
             .into_iter()
-            .map(|arch| command(format!("cargo build --target {arch} {flag}")))
+            .map(|arch| {
+                let mut cmd = command("cargo build");
+                cmd.arg("--target").arg(arch);
+
+                match mode {
+                    Mode::Debug => {}
+                    Mode::Release => {
+                        cmd.arg("--release");
+                    }
+                }
+
+                if let Some(features) = &features.features {
+                    cmd.arg("--features").arg(features.join(","));
+                }
+                if features.all_features {
+                    cmd.arg("--all-features");
+                }
+                if features.no_default_features {
+                    cmd.arg("--no-default-features");
+                }
+
+                cmd
+            })
             .collect()
     }
 
@@ -96,8 +114,14 @@ impl Target {
     ///
     /// This function returns a list of commands that should be executed in their given
     /// order to build this target (and bundle architecture targets with lipo if it is a universal target).
-    pub fn commands(&self, lib_name: &str, mode: Mode, lib_type: LibType) -> Vec<Command> {
-        self.cargo_build_commands(mode)
+    pub fn commands(
+        &self,
+        lib_name: &str,
+        mode: Mode,
+        lib_type: LibType,
+        features: &FeatureOptions,
+    ) -> Vec<Command> {
+        self.cargo_build_commands(mode, features)
             .into_iter()
             .chain(self.lipo_commands(lib_name, mode, lib_type))
             .chain(self.rpath_install_id_commands(lib_name, mode, lib_type))