From 0627a45dee87ffd7d0e8790f391f59c341a70313 Mon Sep 17 00:00:00 2001 From: Alexander Koz Date: Sun, 10 Sep 2023 20:10:35 +0400 Subject: [PATCH] fix versions, metadata, schema moved, remove unnecessary comments --- cargo/Cargo.toml | 5 +++-- cargo-playdate.json => cargo/cargo-playdate.json | 0 cargo/src/init/mod.rs | 2 +- cargo/tests/crates/metadata/Cargo.toml | 7 +------ support/build/Cargo.toml | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) rename cargo-playdate.json => cargo/cargo-playdate.json (100%) diff --git a/cargo/Cargo.toml b/cargo/Cargo.toml index 92c2407b..b82304e4 100644 --- a/cargo/Cargo.toml +++ b/cargo/Cargo.toml @@ -14,9 +14,7 @@ keywords = [ "build", "cargo", "plugin", - "subcommand", "cargo-subcommand", - "gamedev", ] categories = [ "command-line-utilities", @@ -26,6 +24,8 @@ categories = [ # "development-tools::testing", # TODO: uncomment when test command is implemented ] +include = ["cargo-playdate.json"] + [[bin]] name = "cargo-playdate" @@ -61,6 +61,7 @@ log = "0.4" [dependencies.playdate] +version = "0.1" path = "../support/build" package = "playdate-build" features = ["assets-report", "toml"] diff --git a/cargo-playdate.json b/cargo/cargo-playdate.json similarity index 100% rename from cargo-playdate.json rename to cargo/cargo-playdate.json diff --git a/cargo/src/init/mod.rs b/cargo/src/init/mod.rs index 86d1397f..076aaecb 100644 --- a/cargo/src/init/mod.rs +++ b/cargo/src/init/mod.rs @@ -369,7 +369,7 @@ fn cargo_config>(config: &Config, path: P) -> CargoResult<()> { /// \* Local schema currently is default option /// because schema is not published on schemastore.org yet. fn manifest_schema>(config: &Config, dir: P) -> CargoResult> { - let bytes = include_bytes!("../../../cargo-playdate.json"); + let bytes = include_bytes!("../../cargo-playdate.json"); let schema = if config.create_local_schema { let path = dir.as_ref().join(".cargo").join("cargo-playdate.json"); diff --git a/cargo/tests/crates/metadata/Cargo.toml b/cargo/tests/crates/metadata/Cargo.toml index f4046a7f..9ca06024 100644 --- a/cargo/tests/crates/metadata/Cargo.toml +++ b/cargo/tests/crates/metadata/Cargo.toml @@ -14,16 +14,11 @@ publish = false [package.metadata.playdate] bundle-id = "test.workspace.main.crate" -# description = "test" [package.metadata.playdate.assets] "main/" = "Cargo.toml" -# options.method = "link" -# options.overwrite = true -# options.dependencies = true + [package.metadata.playdate.assets.options] -# # [package.metadata.playdate.options] -# # [package.metadata.playdate.options.assets] dependencies = true overwrite = true diff --git a/support/build/Cargo.toml b/support/build/Cargo.toml index ee9ff8c4..ebe08243 100644 --- a/support/build/Cargo.toml +++ b/support/build/Cargo.toml @@ -7,7 +7,7 @@ readme = "README.md" license = "MIT OR Apache-2.0" authors = ["Alex Koz "] description = "Utils that help to build package for Playdate" -keywords = ["playdate", "package", "encoding", "manifest", "assets", "utility"] +keywords = ["playdate", "package", "encoding", "manifest", "assets"] categories = ["development-tools::build-utils"] homepage = "https://github.com/boozook/playdate" repository = "https://github.com/boozook/playdate.git"