Remove Cargo.toml-based configuration property handling

Author: bbqsrc

src/cli.rs

@@ -21,8 +21,9 @@ use filetime::FileTime;
 
 use crate::{
     cargo::{build_env, clang_target},
-    meta::{Ndk, Target},
+    meta::{default_targets, Target},
     shell::{Shell, Verbosity},
+    
 };
 
 #[derive(Debug, Parser)]
@@ -32,8 +33,8 @@ struct ArgsEnv {
     target: Target,
 
     /// platform (also known as API level)
-    #[arg(long)]
-    platform: Option<u8>,
+    #[arg(long, default_value_t = 21)]
+    platform: u8,
 
     /// use PowerShell syntax
     #[arg(long)]
@@ -51,8 +52,8 @@ struct Args {
     target: Vec<Target>,
 
     /// platform (also known as API level)
-    #[arg(long)]
-    platform: Option<u8>,
+    #[arg(long, default_value_t = 21)]
+    platform: u8,
 
     /// output to a jniLibs directory in the correct sub-directories
     #[arg(short, long, value_name = "DIR")]
@@ -330,7 +331,7 @@ pub fn run_env(args: Vec<String>) -> anyhow::Result<()> {
 
     let clang_target = clang_target(
         args.target.triple(),
-        args.platform.unwrap_or(Ndk::default().platform),
+        args.platform,
     );
 
     // Try command line, then config. Config falls back to defaults in any case.
@@ -490,18 +491,6 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
         std::process::exit(1);
     }
 
-    let build_mode = if args.contains(&"--release".into()) {
-        BuildMode::Release
-    } else if let Some(i) = args.iter().position(|x| x == "--profile") {
-        args.get(i + 1)
-            .map(|p| BuildMode::from(p.as_str()))
-            .unwrap_or(BuildMode::Debug)
-    } else {
-        args.iter()
-            .find_map(|a| a.strip_prefix("--profile=").map(BuildMode::from))
-            .unwrap_or(BuildMode::Debug)
-    };
-
     let args = match parse_mixed_args(args) {
         Ok(args) => args,
         Err(e) => {
@@ -594,15 +583,6 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
         })
         .unwrap_or_else(|| working_dir.join("Cargo.toml"));
 
-    let config = match crate::meta::config(&cargo_manifest, &build_mode) {
-        Ok(v) => v,
-        Err(e) => {
-            shell.error("Failed loading manifest")?;
-            shell.error(e)?;
-            std::process::exit(1);
-        }
-    };
-
     let cmake_toolchain_path = ndk_home
         .join("build")
         .join("cmake")
@@ -617,13 +597,13 @@ pub fn run(args: Vec<String>) -> anyhow::Result<()> {
     })?;
     env::set_var("CARGO_NDK_CMAKE_TOOLCHAIN_PATH", cmake_toolchain_path);
 
-    let platform = args.platform.unwrap_or(config.platform);
+    let platform = args.platform;
 
     // Try command line, then config. Config falls back to defaults in any case.
     let targets = if !args.target.is_empty() {
         args.target
     } else {
-        config.targets
+        default_targets().to_vec()
     };
 
     if let Some(output_dir) = args.output_dir.as_ref() {

src/meta.rs

@@ -1,84 +1,18 @@
 use std::fmt::Display;
-use std::path::Path;
 use std::str::FromStr;
 
 use clap::builder::PossibleValue;
 use clap::ValueEnum;
 use serde::Deserialize;
 
-use crate::cli::BuildMode;
-
-const fn default_platform() -> u8 {
-    21
-}
-
-fn default_targets() -> Vec<Target> {
-    vec![Target::ArmeabiV7a, Target::Arm64V8a]
-}
-
-#[derive(Debug, Deserialize)]
-struct CargoToml {
-    package: Option<Package>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Package {
-    metadata: Option<Metadata>,
-}
-
-#[derive(Debug, Deserialize)]
-struct Metadata {
-    ndk: Option<Ndk>,
-}
-
-#[derive(Debug, Deserialize, Clone)]
-pub(crate) struct Ndk {
-    #[serde(default = "default_platform")]
-    pub platform: u8,
-
-    #[serde(default = "default_targets")]
-    targets: Vec<Target>,
-
-    release: Option<NdkTarget>,
-    debug: Option<NdkTarget>,
+pub(crate) fn default_targets() -> &'static [Target] {
+    &[Target::ArmeabiV7a, Target::Arm64V8a]
 }
 
-impl Default for Ndk {
-    fn default() -> Self {
-        Self {
-            platform: default_platform(),
-            targets: default_targets(),
-            release: None,
-            debug: None,
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Clone)]
-struct NdkTarget {
-    targets: Vec<Target>,
-}
-
-#[derive(Debug)]
-pub struct Config {
-    pub platform: u8,
-    pub targets: Vec<Target>,
-}
-
-impl Default for Config {
-    fn default() -> Self {
-        Self {
-            platform: Ndk::default().platform,
-            targets: default_targets(),
-        }
-    }
-}
-
-#[derive(Debug, Deserialize, Default, Clone)]
+#[derive(Debug, Deserialize, Copy, Clone)]
 pub enum Target {
     #[serde(rename = "armeabi-v7a")]
     ArmeabiV7a,
-    #[default]
     #[serde(rename = "arm64-v8a")]
     Arm64V8a,
     #[serde(rename = "x86")]
@@ -143,32 +77,3 @@ impl Target {
         }
     }
 }
-
-pub(crate) fn config(
-    cargo_toml_path: &Path,
-    build_mode: &BuildMode,
-) -> Result<Config, anyhow::Error> {
-    let toml_string = std::fs::read_to_string(cargo_toml_path)?;
-    let cargo_toml: CargoToml = toml::from_str(&toml_string)?;
-
-    let package = cargo_toml.package;
-
-    let ndk = package
-        .as_ref()
-        .and_then(|x| x.metadata.as_ref())
-        .and_then(|x| x.ndk.as_ref())
-        .cloned()
-        .unwrap_or_default();
-    let base_targets = ndk.targets;
-
-    let targets = if matches!(build_mode, BuildMode::Release) {
-        ndk.release.map_or_else(|| base_targets, |x| x.targets)
-    } else {
-        ndk.debug.map_or_else(|| base_targets, |x| x.targets)
-    };
-
-    Ok(Config {
-        platform: ndk.platform,
-        targets,
-    })
-}