From 201b53f1dd173bdfa0258b49d7f422b169bb9ba8 Mon Sep 17 00:00:00 2001 From: Yuyi Wang Date: Fri, 17 Mar 2023 20:01:03 +0800 Subject: [PATCH 1/5] Update metadata of utils. --- bins/Cargo.lock | 16 ++++++++-------- plugins/Cargo.lock | 12 ++++++------ utils/Cargo.toml | 9 +++++++++ utils/ayaka-bindings-impl/Cargo.toml | 11 ++++++++--- utils/ayaka-bindings-types/Cargo.toml | 11 ++++++++--- utils/ayaka-bindings/Cargo.toml | 11 ++++++++--- utils/ayaka-model/Cargo.toml | 10 ++++++++-- utils/ayaka-plugin-nop/Cargo.toml | 10 ++++++++-- utils/ayaka-plugin-wasmer/Cargo.toml | 10 ++++++++-- utils/ayaka-plugin-wasmi/Cargo.toml | 10 ++++++++-- utils/ayaka-plugin-wasmtime/Cargo.toml | 10 ++++++++-- utils/ayaka-plugin/Cargo.toml | 10 ++++++++-- utils/ayaka-primitive/Cargo.toml | 10 ++++++++-- utils/ayaka-runtime/Cargo.toml | 10 ++++++++-- utils/ayaka-script/Cargo.toml | 10 ++++++++-- 15 files changed, 119 insertions(+), 41 deletions(-) diff --git a/bins/Cargo.lock b/bins/Cargo.lock index 80a4cee7..1fc1bda5 100644 --- a/bins/Cargo.lock +++ b/bins/Cargo.lock @@ -158,7 +158,7 @@ dependencies = [ [[package]] name = "ayaka-bindings-types" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-primitive", "fallback", @@ -206,7 +206,7 @@ dependencies = [ [[package]] name = "ayaka-model" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-runtime", "serde", @@ -216,7 +216,7 @@ dependencies = [ [[package]] name = "ayaka-plugin" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "rmp-serde", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "ayaka-plugin-nop" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "ayaka-plugin", @@ -233,7 +233,7 @@ dependencies = [ [[package]] name = "ayaka-plugin-wasmi" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-plugin", "wasmi", @@ -241,7 +241,7 @@ dependencies = [ [[package]] name = "ayaka-primitive" -version = "0.1.0" +version = "0.2.0" dependencies = [ "nom", "serde", @@ -250,7 +250,7 @@ dependencies = [ [[package]] name = "ayaka-runtime" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "ayaka-bindings-types", @@ -278,7 +278,7 @@ dependencies = [ [[package]] name = "ayaka-script" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "ayaka-primitive", diff --git a/plugins/Cargo.lock b/plugins/Cargo.lock index bcb30c53..d926d1b0 100644 --- a/plugins/Cargo.lock +++ b/plugins/Cargo.lock @@ -36,7 +36,7 @@ dependencies = [ [[package]] name = "ayaka-bindings" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings-impl", "ayaka-bindings-types", @@ -49,7 +49,7 @@ dependencies = [ [[package]] name = "ayaka-bindings-impl" -version = "0.1.0" +version = "0.2.0" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "ayaka-bindings-types" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-primitive", "fallback", @@ -70,7 +70,7 @@ dependencies = [ [[package]] name = "ayaka-plugin" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "rmp-serde", @@ -79,7 +79,7 @@ dependencies = [ [[package]] name = "ayaka-primitive" -version = "0.1.0" +version = "0.2.0" dependencies = [ "nom", "serde", @@ -88,7 +88,7 @@ dependencies = [ [[package]] name = "ayaka-script" -version = "0.1.0" +version = "0.2.0" dependencies = [ "anyhow", "ayaka-primitive", diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 808dabdd..7f0e4fb4 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -14,6 +14,15 @@ members = [ resolver = "2" +[workspace.package] +version = "0.2.0" +edition = "2021" +authors = ["Berrysoft "] +categories = ["game-engines"] +keywords = ["game", "engine", "galgame"] +license = "MIT" +repository = "https://github.com/Uni-Gal/Ayaka" + [workspace.dependencies] ayaka-primitive = { path = "ayaka-primitive" } ayaka-bindings-types = { path = "ayaka-bindings-types" } diff --git a/utils/ayaka-bindings-impl/Cargo.toml b/utils/ayaka-bindings-impl/Cargo.toml index de190271..3c757321 100644 --- a/utils/ayaka-bindings-impl/Cargo.toml +++ b/utils/ayaka-bindings-impl/Cargo.toml @@ -1,8 +1,13 @@ [package] name = "ayaka-bindings-impl" -version = "0.1.0" -authors = ["Berrysoft "] -edition = "2021" +description = "Proc macro for ayaka-bindings." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] proc-macro = true diff --git a/utils/ayaka-bindings-types/Cargo.toml b/utils/ayaka-bindings-types/Cargo.toml index fd5e253c..b395a207 100644 --- a/utils/ayaka-bindings-types/Cargo.toml +++ b/utils/ayaka-bindings-types/Cargo.toml @@ -1,8 +1,13 @@ [package] name = "ayaka-bindings-types" -version = "0.1.0" -authors = ["Berrysoft "] -edition = "2021" +description = "Types both used in Ayaka runtime and Ayaka plugins." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-primitive = { workspace = true } diff --git a/utils/ayaka-bindings/Cargo.toml b/utils/ayaka-bindings/Cargo.toml index 95c9e8a8..03f45f56 100644 --- a/utils/ayaka-bindings/Cargo.toml +++ b/utils/ayaka-bindings/Cargo.toml @@ -1,8 +1,13 @@ [package] name = "ayaka-bindings" -version = "0.1.0" -authors = ["Berrysoft "] -edition = "2021" +description = "WASM bindings of plugins written for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-primitive = { workspace = true } diff --git a/utils/ayaka-model/Cargo.toml b/utils/ayaka-model/Cargo.toml index ca8e6f6d..f5c74b77 100644 --- a/utils/ayaka-model/Cargo.toml +++ b/utils/ayaka-model/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-model" -version = "0.1.0" -edition = "2021" +description = "Ayaka high-level runtime." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-runtime = { workspace = true } diff --git a/utils/ayaka-plugin-nop/Cargo.toml b/utils/ayaka-plugin-nop/Cargo.toml index 2956c06f..22307a3b 100644 --- a/utils/ayaka-plugin-nop/Cargo.toml +++ b/utils/ayaka-plugin-nop/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-plugin-nop" -version = "0.1.0" -edition = "2021" +description = "A dummy plugin runtime for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-plugin = { workspace = true } diff --git a/utils/ayaka-plugin-wasmer/Cargo.toml b/utils/ayaka-plugin-wasmer/Cargo.toml index 54ce54a1..4b6667d8 100644 --- a/utils/ayaka-plugin-wasmer/Cargo.toml +++ b/utils/ayaka-plugin-wasmer/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-plugin-wasmer" -version = "0.1.0" -edition = "2021" +description = "A plugin runtime for Ayaka, based on Wasmer." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-plugin = { workspace = true } diff --git a/utils/ayaka-plugin-wasmi/Cargo.toml b/utils/ayaka-plugin-wasmi/Cargo.toml index 346e2221..de95624e 100644 --- a/utils/ayaka-plugin-wasmi/Cargo.toml +++ b/utils/ayaka-plugin-wasmi/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-plugin-wasmi" -version = "0.1.0" -edition = "2021" +description = "A plugin runtime for Ayaka, based on Wasmi." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-plugin = { workspace = true } diff --git a/utils/ayaka-plugin-wasmtime/Cargo.toml b/utils/ayaka-plugin-wasmtime/Cargo.toml index 31f1ee01..c9b1dc29 100644 --- a/utils/ayaka-plugin-wasmtime/Cargo.toml +++ b/utils/ayaka-plugin-wasmtime/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-plugin-wasmtime" -version = "0.1.0" -edition = "2021" +description = "A plugin runtime for Ayaka, based on Wasmtime." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-plugin = { workspace = true } diff --git a/utils/ayaka-plugin/Cargo.toml b/utils/ayaka-plugin/Cargo.toml index 5fb84a27..4d4e569e 100644 --- a/utils/ayaka-plugin/Cargo.toml +++ b/utils/ayaka-plugin/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-plugin" -version = "0.1.0" -edition = "2021" +description = "Plugin runtime interface for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] serde = { workspace = true } diff --git a/utils/ayaka-primitive/Cargo.toml b/utils/ayaka-primitive/Cargo.toml index a9c5c0ab..a5477135 100644 --- a/utils/ayaka-primitive/Cargo.toml +++ b/utils/ayaka-primitive/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-primitive" -version = "0.1.0" -edition = "2021" +description = "Primitive types for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] serde = { workspace = true, features = ["derive"] } diff --git a/utils/ayaka-runtime/Cargo.toml b/utils/ayaka-runtime/Cargo.toml index 8e203bce..6315d636 100644 --- a/utils/ayaka-runtime/Cargo.toml +++ b/utils/ayaka-runtime/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-runtime" -version = "0.1.0" -edition = "2021" +description = "Ayaka low-level runtime." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-primitive = { workspace = true } diff --git a/utils/ayaka-script/Cargo.toml b/utils/ayaka-script/Cargo.toml index 900e25d5..b7b4bb6a 100644 --- a/utils/ayaka-script/Cargo.toml +++ b/utils/ayaka-script/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-script" -version = "0.1.0" -edition = "2021" +description = "First-class script language in Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-primitive = { workspace = true } From 61d128fe112db2212f0bf5bb587ac5a55e15eb53 Mon Sep 17 00:00:00 2001 From: Yuyi Wang Date: Fri, 17 Mar 2023 20:05:51 +0800 Subject: [PATCH 2/5] Update metadata for plugins. --- plugins/Cargo.lock | 14 +++++++------- plugins/Cargo.toml | 9 +++++++++ plugins/ayacript/Cargo.toml | 10 ++++++++-- plugins/ayalog/Cargo.toml | 10 ++++++++-- plugins/basictex/Cargo.toml | 10 ++++++++-- plugins/live2d/Cargo.toml | 10 ++++++++-- plugins/markdown/Cargo.toml | 10 ++++++++-- plugins/media/Cargo.toml | 10 ++++++++-- plugins/random/Cargo.toml | 10 ++++++++-- 9 files changed, 72 insertions(+), 21 deletions(-) diff --git a/plugins/Cargo.lock b/plugins/Cargo.lock index d926d1b0..adaa0688 100644 --- a/plugins/Cargo.lock +++ b/plugins/Cargo.lock @@ -25,7 +25,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "ayacript" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", "ayaka-bindings-types", @@ -97,7 +97,7 @@ dependencies = [ [[package]] name = "ayalog" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", ] @@ -110,7 +110,7 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "basictex" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", ] @@ -373,7 +373,7 @@ dependencies = [ [[package]] name = "live2d" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", ] @@ -390,7 +390,7 @@ dependencies = [ [[package]] name = "markdown" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", "pulldown-cmark", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "media" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", ] @@ -498,7 +498,7 @@ dependencies = [ [[package]] name = "random" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-bindings", ] diff --git a/plugins/Cargo.toml b/plugins/Cargo.toml index 8e41f25d..b1339479 100644 --- a/plugins/Cargo.toml +++ b/plugins/Cargo.toml @@ -11,6 +11,15 @@ members = [ resolver = "2" +[workspace.package] +version = "0.2.0" +edition = "2021" +authors = ["Berrysoft "] +categories = ["wasm"] +keywords = ["wasm", "plugin"] +license = "MIT" +repository = "https://github.com/Uni-Gal/Ayaka" + [profile.release] lto = true codegen-units = 1 diff --git a/plugins/ayacript/Cargo.toml b/plugins/ayacript/Cargo.toml index d8aaaab0..cfdb6215 100644 --- a/plugins/ayacript/Cargo.toml +++ b/plugins/ayacript/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayacript" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Ayaka script runtime." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/ayalog/Cargo.toml b/plugins/ayalog/Cargo.toml index 169abed9..506311e3 100644 --- a/plugins/ayalog/Cargo.toml +++ b/plugins/ayalog/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayalog" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Logger." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/basictex/Cargo.toml b/plugins/basictex/Cargo.toml index 802129d8..ce65629e 100644 --- a/plugins/basictex/Cargo.toml +++ b/plugins/basictex/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "basictex" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Basic TeX commands." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/live2d/Cargo.toml b/plugins/live2d/Cargo.toml index 6c8f5064..83078a23 100644 --- a/plugins/live2d/Cargo.toml +++ b/plugins/live2d/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "live2d" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Live2D resource resolver." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/markdown/Cargo.toml b/plugins/markdown/Cargo.toml index 7860e711..e37ff9ec 100644 --- a/plugins/markdown/Cargo.toml +++ b/plugins/markdown/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "markdown" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Markdown parser." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/media/Cargo.toml b/plugins/media/Cargo.toml index 35a2b767..ff42ad8d 100644 --- a/plugins/media/Cargo.toml +++ b/plugins/media/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "media" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Multimedia resource resolver." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] diff --git a/plugins/random/Cargo.toml b/plugins/random/Cargo.toml index 8e6aeab0..5468b192 100644 --- a/plugins/random/Cargo.toml +++ b/plugins/random/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "random" -version = "0.1.0" -edition = "2021" +description = "Plugin for Ayaka. Random number generator." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [lib] crate-type = ["cdylib"] From 212ebe4dbf630ae4bfe77e5972c7e0cf9322f1c8 Mon Sep 17 00:00:00 2001 From: Yuyi Wang Date: Fri, 17 Mar 2023 20:18:05 +0800 Subject: [PATCH 3/5] Update metadata of bins. --- bins/Cargo.lock | 10 +++++----- bins/Cargo.toml | 19 +++++++++++++------ bins/ayaka-check/Cargo.toml | 10 ++++++++-- bins/ayaka-gui/src-tauri/Cargo.toml | 14 ++++++++++---- bins/ayaka-latex/Cargo.toml | 10 ++++++++-- 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/bins/Cargo.lock b/bins/Cargo.lock index 1fc1bda5..afd00927 100644 --- a/bins/Cargo.lock +++ b/bins/Cargo.lock @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "ayaka-check" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-runtime", "clap 4.1.8", @@ -179,7 +179,7 @@ dependencies = [ [[package]] name = "ayaka-gui" -version = "0.1.0" +version = "0.2.0" dependencies = [ "axum", "ayaka-model", @@ -196,7 +196,7 @@ dependencies = [ [[package]] name = "ayaka-latex" -version = "0.1.0" +version = "0.2.0" dependencies = [ "ayaka-runtime", "clap 4.1.8", @@ -3770,9 +3770,9 @@ checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" [[package]] name = "toml_edit" -version = "0.19.4" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" +checksum = "dc18466501acd8ac6a3f615dd29a3438f8ca6bb3b19537138b3106e575621274" dependencies = [ "indexmap", "toml_datetime", diff --git a/bins/Cargo.toml b/bins/Cargo.toml index 85eb23be..2016d3a1 100644 --- a/bins/Cargo.toml +++ b/bins/Cargo.toml @@ -1,12 +1,17 @@ [workspace] -members = [ - "ayaka-check", - "ayaka-gui/src-tauri", - "ayaka-latex", -] +members = ["ayaka-check", "ayaka-gui/src-tauri", "ayaka-latex"] resolver = "2" +[workspace.package] +version = "0.2.0" +edition = "2021" +authors = ["Berrysoft "] +categories = ["game-development"] +keywords = ["game", "engine", "galgame"] +license = "MIT" +repository = "https://github.com/Uni-Gal/Ayaka" + [profile.release] lto = true codegen-units = 1 @@ -17,4 +22,6 @@ ayaka-runtime = { path = "../utils/ayaka-runtime" } ayaka-model = { path = "../utils/ayaka-model" } tokio = { version = "1" } clap = { version = "4" } -flexi_logger = { version = "0.25", default-features = false, features = ["colors"] } +flexi_logger = { version = "0.25", default-features = false, features = [ + "colors", +] } diff --git a/bins/ayaka-check/Cargo.toml b/bins/ayaka-check/Cargo.toml index 49314211..7137ada1 100644 --- a/bins/ayaka-check/Cargo.toml +++ b/bins/ayaka-check/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-check" -version = "0.1.0" -edition = "2021" +description = "CLI frontend for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-runtime = { workspace = true } diff --git a/bins/ayaka-gui/src-tauri/Cargo.toml b/bins/ayaka-gui/src-tauri/Cargo.toml index 6295d471..03baff4a 100644 --- a/bins/ayaka-gui/src-tauri/Cargo.toml +++ b/bins/ayaka-gui/src-tauri/Cargo.toml @@ -1,6 +1,8 @@ [package] name = "ayaka-gui" -version = "0.1.0" +description = "GUI frontend for Ayaka." +# TODO: inherit from workspace +version = "0.2.0" edition = "2021" [build-dependencies] @@ -16,10 +18,14 @@ serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } tauri = { version = "1.2", features = ["cli", "window-all"] } tauri-plugin-window-state = "0.1" -axum = { version = "0.6", default-features = false, features = ["http1", "tokio", "headers"] } +axum = { version = "0.6", default-features = false, features = [ + "http1", + "tokio", + "headers", +] } tower-http = { version = "0.4", features = ["cors", "trace"] } mime_guess = "2.0" [features] -default = [ "custom-protocol" ] -custom-protocol = [ "tauri/custom-protocol" ] +default = ["custom-protocol"] +custom-protocol = ["tauri/custom-protocol"] diff --git a/bins/ayaka-latex/Cargo.toml b/bins/ayaka-latex/Cargo.toml index de427a12..0a517369 100644 --- a/bins/ayaka-latex/Cargo.toml +++ b/bins/ayaka-latex/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "ayaka-latex" -version = "0.1.0" -edition = "2021" +description = "LaTeX compiler for Ayaka." +version.workspace = true +edition.workspace = true +authors.workspace = true +categories.workspace = true +keywords.workspace = true +license.workspace = true +repository.workspace = true [dependencies] ayaka-runtime = { workspace = true } From aa5ffc18735c23ce858c17648590bb79fd4e6bad Mon Sep 17 00:00:00 2001 From: Yuyi Wang Date: Fri, 17 Mar 2023 20:24:31 +0800 Subject: [PATCH 4/5] Update version used in utils workspace. --- utils/Cargo.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 7f0e4fb4..b2326aee 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -24,16 +24,16 @@ license = "MIT" repository = "https://github.com/Uni-Gal/Ayaka" [workspace.dependencies] -ayaka-primitive = { path = "ayaka-primitive" } -ayaka-bindings-types = { path = "ayaka-bindings-types" } -ayaka-bindings-impl = { path = "ayaka-bindings-impl" } -ayaka-plugin = { path = "ayaka-plugin" } -ayaka-plugin-nop = { path = "ayaka-plugin-nop" } -ayaka-plugin-wasmer = { path = "ayaka-plugin-wasmer" } -ayaka-plugin-wasmtime = { path = "ayaka-plugin-wasmtime" } -ayaka-plugin-wasmi = { path = "ayaka-plugin-wasmi" } -ayaka-script = { path = "ayaka-script" } -ayaka-runtime = { path = "ayaka-runtime" } +ayaka-primitive = { path = "ayaka-primitive", version = "0.2.0" } +ayaka-bindings-types = { path = "ayaka-bindings-types", version = "0.2.0" } +ayaka-bindings-impl = { path = "ayaka-bindings-impl", version = "0.2.0" } +ayaka-plugin = { path = "ayaka-plugin", version = "0.2.0" } +ayaka-plugin-nop = { path = "ayaka-plugin-nop", version = "0.2.0" } +ayaka-plugin-wasmer = { path = "ayaka-plugin-wasmer", version = "0.2.0" } +ayaka-plugin-wasmtime = { path = "ayaka-plugin-wasmtime", version = "0.2.0" } +ayaka-plugin-wasmi = { path = "ayaka-plugin-wasmi", version = "0.2.0" } +ayaka-script = { path = "ayaka-script", version = "0.2.0" } +ayaka-runtime = { path = "ayaka-runtime", version = "0.2.0" } anyhow = "1.0" From 8d84e2e2c640c1152d57209c47c51917c837c836 Mon Sep 17 00:00:00 2001 From: Yuyi Wang Date: Fri, 17 Mar 2023 20:31:32 +0800 Subject: [PATCH 5/5] Rename plugins. --- plugins/Cargo.lock | 108 ++++++++++++++++++------------------ plugins/ayacript/Cargo.toml | 3 +- plugins/ayalog/Cargo.toml | 3 +- plugins/basictex/Cargo.toml | 3 +- plugins/live2d/Cargo.toml | 3 +- plugins/markdown/Cargo.toml | 3 +- plugins/media/Cargo.toml | 3 +- plugins/random/Cargo.toml | 3 +- 8 files changed, 68 insertions(+), 61 deletions(-) diff --git a/plugins/Cargo.lock b/plugins/Cargo.lock index adaa0688..e1362cdd 100644 --- a/plugins/Cargo.lock +++ b/plugins/Cargo.lock @@ -23,17 +23,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "ayacript" -version = "0.2.0" -dependencies = [ - "ayaka-bindings", - "ayaka-bindings-types", - "ayaka-plugin", - "ayaka-script", - "trylog", -] - [[package]] name = "ayaka-bindings" version = "0.2.0" @@ -78,43 +67,83 @@ dependencies = [ ] [[package]] -name = "ayaka-primitive" +name = "ayaka-plugin-basictex" version = "0.2.0" dependencies = [ - "nom", - "serde", - "serde_with", + "ayaka-bindings", ] [[package]] -name = "ayaka-script" +name = "ayaka-plugin-live2d" version = "0.2.0" dependencies = [ - "anyhow", - "ayaka-primitive", - "serde", + "ayaka-bindings", ] [[package]] -name = "ayalog" +name = "ayaka-plugin-log" version = "0.2.0" dependencies = [ "ayaka-bindings", ] [[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +name = "ayaka-plugin-markdown" +version = "0.2.0" +dependencies = [ + "ayaka-bindings", + "pulldown-cmark", +] + +[[package]] +name = "ayaka-plugin-media" +version = "0.2.0" +dependencies = [ + "ayaka-bindings", +] [[package]] -name = "basictex" +name = "ayaka-plugin-random" version = "0.2.0" dependencies = [ "ayaka-bindings", ] +[[package]] +name = "ayaka-plugin-script" +version = "0.2.0" +dependencies = [ + "ayaka-bindings", + "ayaka-bindings-types", + "ayaka-plugin", + "ayaka-script", + "trylog", +] + +[[package]] +name = "ayaka-primitive" +version = "0.2.0" +dependencies = [ + "nom", + "serde", + "serde_with", +] + +[[package]] +name = "ayaka-script" +version = "0.2.0" +dependencies = [ + "anyhow", + "ayaka-primitive", + "serde", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + [[package]] name = "bitflags" version = "1.3.2" @@ -371,13 +400,6 @@ dependencies = [ "cc", ] -[[package]] -name = "live2d" -version = "0.2.0" -dependencies = [ - "ayaka-bindings", -] - [[package]] name = "log" version = "0.4.17" @@ -388,21 +410,6 @@ dependencies = [ "serde", ] -[[package]] -name = "markdown" -version = "0.2.0" -dependencies = [ - "ayaka-bindings", - "pulldown-cmark", -] - -[[package]] -name = "media" -version = "0.2.0" -dependencies = [ - "ayaka-bindings", -] - [[package]] name = "memchr" version = "2.5.0" @@ -496,13 +503,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "random" -version = "0.2.0" -dependencies = [ - "ayaka-bindings", -] - [[package]] name = "rmp" version = "0.8.11" diff --git a/plugins/ayacript/Cargo.toml b/plugins/ayacript/Cargo.toml index cfdb6215..c57c7aa1 100644 --- a/plugins/ayacript/Cargo.toml +++ b/plugins/ayacript/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ayacript" +name = "ayaka-plugin-script" description = "Plugin for Ayaka. Ayaka script runtime." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "ayacript" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/ayalog/Cargo.toml b/plugins/ayalog/Cargo.toml index 506311e3..1f4407fe 100644 --- a/plugins/ayalog/Cargo.toml +++ b/plugins/ayalog/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "ayalog" +name = "ayaka-plugin-log" description = "Plugin for Ayaka. Logger." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "ayalog" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/basictex/Cargo.toml b/plugins/basictex/Cargo.toml index ce65629e..a9019584 100644 --- a/plugins/basictex/Cargo.toml +++ b/plugins/basictex/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "basictex" +name = "ayaka-plugin-basictex" description = "Plugin for Ayaka. Basic TeX commands." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "basictex" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/live2d/Cargo.toml b/plugins/live2d/Cargo.toml index 83078a23..b84c493f 100644 --- a/plugins/live2d/Cargo.toml +++ b/plugins/live2d/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "live2d" +name = "ayaka-plugin-live2d" description = "Plugin for Ayaka. Live2D resource resolver." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "live2d" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/markdown/Cargo.toml b/plugins/markdown/Cargo.toml index e37ff9ec..dbaf3e90 100644 --- a/plugins/markdown/Cargo.toml +++ b/plugins/markdown/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "markdown" +name = "ayaka-plugin-markdown" description = "Plugin for Ayaka. Markdown parser." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "markdown" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/media/Cargo.toml b/plugins/media/Cargo.toml index ff42ad8d..4cf03e91 100644 --- a/plugins/media/Cargo.toml +++ b/plugins/media/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "media" +name = "ayaka-plugin-media" description = "Plugin for Ayaka. Multimedia resource resolver." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "media" crate-type = ["cdylib"] [dependencies] diff --git a/plugins/random/Cargo.toml b/plugins/random/Cargo.toml index 5468b192..e29d658d 100644 --- a/plugins/random/Cargo.toml +++ b/plugins/random/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "random" +name = "ayaka-plugin-random" description = "Plugin for Ayaka. Random number generator." version.workspace = true edition.workspace = true @@ -10,6 +10,7 @@ license.workspace = true repository.workspace = true [lib] +name = "random" crate-type = ["cdylib"] [dependencies]