diff --git a/Cargo.lock b/Cargo.lock index 90e0dd13..3fd191a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -155,7 +155,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", "which", ] @@ -237,9 +237,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -328,7 +328,7 @@ dependencies = [ "sha1", "shell-escape", "strip-ansi-escapes", - "syn 2.0.37", + "syn 2.0.38", "tar", "tempfile", "termcolor", @@ -353,7 +353,7 @@ dependencies = [ [[package]] name = "cargo-playdate" -version = "0.3.7" +version = "0.3.8" dependencies = [ "anyhow", "byteorder", @@ -492,7 +492,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2506,7 +2506,7 @@ dependencies = [ "proc-macro2", "quote", "semver", - "syn 2.0.37", + "syn 2.0.38", "which", ] @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "playdate-color" -version = "0.2.1" +version = "0.2.2" dependencies = [ "playdate-sys", ] @@ -2711,7 +2711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2725,9 +2725,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" dependencies = [ "unicode-ident", ] @@ -3010,7 +3010,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3225,9 +3225,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -3310,7 +3310,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3593,7 +3593,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -3615,7 +3615,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3821,9 +3821,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml index 97e9f8a1..39f12a5d 100644 --- a/cargo/Cargo.toml +++ b/cargo/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-playdate" -version = "0.3.7" +version = "0.3.8" readme = "README.md" description = "Build tool for neat yellow console." keywords = ["playdate", "build", "cargo", "plugin", "cargo-subcommand"] diff --git a/cargo/src/cli/mod.rs b/cargo/src/cli/mod.rs index 314d3a7b..834cfaed 100644 --- a/cargo/src/cli/mod.rs +++ b/cargo/src/cli/mod.rs @@ -226,6 +226,7 @@ pub fn initialize_from(args: impl IntoIterator + AsRe // zip flag for package: let zip = matches.flag("zip"); + let no_info_meta = matches.flag("no-info-file"); // shorthand for panic behavior: let prevent_unwinding = matches.flag("no-unwinding"); @@ -288,6 +289,7 @@ pub fn initialize_from(args: impl IntoIterator + AsRe mounting, no_wait, zip, + no_info_meta, prevent_unwinding, create_path, create_full_config, diff --git a/cargo/src/cli/opts.rs b/cargo/src/cli/opts.rs index facb78f0..86a67030 100644 --- a/cargo/src/cli/opts.rs +++ b/cargo/src/cli/opts.rs @@ -46,14 +46,16 @@ pub fn special_args_for(cmd: &Cmd) -> Vec { match cmd { Cmd::Build => shorthands_for(cmd), Cmd::Run => { - let mut vec = mount(); - vec.append(&mut shorthands_for(cmd)); - vec.push(flag_no_wait()); - vec + let mut args = mount(); + args.append(&mut shorthands_for(cmd)); + args.push(flag_no_wait()); + args.push(flag_no_info_file()); + args }, Cmd::Package => { let mut args = special_args_for(&Cmd::Build); args.push(flag_zip_package()); + args.push(flag_no_info_file()); args }, Cmd::Assets => vec![flag_pdc_skip_unknown()], @@ -282,6 +284,13 @@ fn flag_zip_package() -> Arg { .action(ArgAction::SetTrue) } +fn flag_no_info_file() -> Arg { + let name = "no-info-file"; + Arg::new(&name).long(&name) + .help(format!("Opt-out inclusion info file with builder version into the produced package")) + .action(ArgAction::SetTrue) +} + fn flag_no_unwinding() -> Arg { let name = "no-unwinding"; const SHORT: &str = diff --git a/cargo/src/config.rs b/cargo/src/config.rs index d7680ca8..634881ac 100644 --- a/cargo/src/config.rs +++ b/cargo/src/config.rs @@ -41,6 +41,7 @@ pub struct Config<'cfg> { pub no_wait: bool, pub zip: bool, + pub no_info_meta: bool, pub prevent_unwinding: bool, @@ -82,6 +83,7 @@ impl<'cfg> Config<'cfg> { mounting: Option, no_wait: bool, zip: bool, + no_info_meta: bool, prevent_unwinding: bool, create_path: Option, create_full_config: bool, @@ -108,6 +110,7 @@ impl<'cfg> Config<'cfg> { mounting, no_wait, zip, + no_info_meta, prevent_unwinding, create_path, create_full_config, diff --git a/cargo/src/package/mod.rs b/cargo/src/package/mod.rs index 5d9c456c..d46dae3a 100644 --- a/cargo/src/package/mod.rs +++ b/cargo/src/package/mod.rs @@ -114,7 +114,9 @@ fn package_single_target<'p>(config: &Config, // finally call pdc and pack: let mut artifact = execute_pdc(config, &product.layout)?; - ar::add_info_meta(&artifact)?; + if !config.no_info_meta { + ar::add_info_meta(&artifact)?; + } if config.zip { artifact = ar::build(artifact)?; }