From aa6297f5a7bc49e6e01dfb8d1425c3a4dd1f4dba Mon Sep 17 00:00:00 2001 From: amr-crabnebula Date: Thu, 5 Oct 2023 01:41:03 +0300 Subject: [PATCH] release: apply version updates from current changes --- .changes/inital-release.md | 6 --- Cargo.lock | 4 +- crates/config/CHANGELOG.md | 5 +++ crates/config/Cargo.toml | 14 +++--- crates/config/schema.json | 2 +- crates/config/src/lib.rs | 14 +++++- crates/packager/CHANGELOG.md | 9 ++++ crates/packager/Cargo.toml | 86 +++++++++++++++++++----------------- crates/packager/schema.json | 2 +- 9 files changed, 84 insertions(+), 58 deletions(-) delete mode 100644 .changes/inital-release.md create mode 100644 crates/config/CHANGELOG.md create mode 100644 crates/packager/CHANGELOG.md diff --git a/.changes/inital-release.md b/.changes/inital-release.md deleted file mode 100644 index e89b6328..00000000 --- a/.changes/inital-release.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"cargo-packager": "patch" -"cargo-packager-config": "minor" ---- - -Initial Release diff --git a/Cargo.lock b/Cargo.lock index 5cf18c7b..b277ac8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,7 +758,7 @@ dependencies = [ [[package]] name = "cargo-packager" -version = "0.1.0" +version = "0.1.1" dependencies = [ "ar", "base64 0.21.4", @@ -804,7 +804,7 @@ dependencies = [ [[package]] name = "cargo-packager-config" -version = "0.0.0" +version = "0.1.0" dependencies = [ "clap", "schemars", diff --git a/crates/config/CHANGELOG.md b/crates/config/CHANGELOG.md new file mode 100644 index 00000000..e013c07b --- /dev/null +++ b/crates/config/CHANGELOG.md @@ -0,0 +1,5 @@ +# Changelog + +## \[0.1.0] + +- [`2d8b8d7`](https://www.github.com/crabnebula-dev/cargo-packager/commit/2d8b8d7c1af73202639449a00dbc51bf171effc7) Initial Release diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 7a90175c..5ff80c3d 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -1,21 +1,21 @@ [package] name = "cargo-packager-config" -version = "0.0.0" +version = "0.1.0" description = "Config types for cargo-packager." authors = [ - "CrabNebula Ltd.", - "Tauri Programme within The Commons Conservancy", - "George Burton ", + "CrabNebula Ltd.", + "Tauri Programme within The Commons Conservancy", + "George Burton " ] edition = "2021" license = "Apache-2.0 OR MIT" repository = "https://github.com/crabnebula-dev/cargo-packager" [features] -clap = ["dep:clap"] +clap = [ "dep:clap" ] [dependencies] -serde.workspace = true -schemars.workspace = true +serde = { workspace = true } +schemars = { workspace = true } clap = { workspace = true, optional = true } strsim = "0.10" diff --git a/crates/config/schema.json b/crates/config/schema.json index d3c458d0..4f538540 100644 --- a/crates/config/schema.json +++ b/crates/config/schema.json @@ -591,7 +591,7 @@ } }, "desktopTemplate": { - "description": "Path to a custom desktop file Handlebars template.\n\nAvailable variables: `categories`, `comment` (optional), `exec`, `icon` and `name`.\n\nDefault file contents: ```text ```", + "description": "Path to a custom desktop file Handlebars template.\n\nAvailable variables: `categories`, `comment` (optional), `exec`, `icon` and `name`.\n\nDefault file contents: ```text [Desktop Entry] Categories={{categories}} {{#if comment}} Comment={{comment}} {{/if}} Exec={{exec}} Icon={{icon}} Name={{name}} Terminal=false Type=Application {{#if mime_type}} MimeType={{mime_type}} {{/if}} ```", "type": [ "string", "null" diff --git a/crates/config/src/lib.rs b/crates/config/src/lib.rs index e5d61095..aa695f11 100644 --- a/crates/config/src/lib.rs +++ b/crates/config/src/lib.rs @@ -231,7 +231,19 @@ pub struct DebianConfig { /// /// Default file contents: /// ```text - #[doc = include_str!("../../packager/src/package/deb/main.desktop")] + /// [Desktop Entry] + /// Categories={{categories}} + /// {{#if comment}} + /// Comment={{comment}} + /// {{/if}} + /// Exec={{exec}} + /// Icon={{icon}} + /// Name={{name}} + /// Terminal=false + /// Type=Application + /// {{#if mime_type}} + /// MimeType={{mime_type}} + /// {{/if}} /// ``` #[serde(alias = "desktop-template", alias = "desktop_template")] pub desktop_template: Option, diff --git a/crates/packager/CHANGELOG.md b/crates/packager/CHANGELOG.md new file mode 100644 index 00000000..d293ebf5 --- /dev/null +++ b/crates/packager/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +## \[0.1.1] + +- [`2d8b8d7`](https://www.github.com/crabnebula-dev/cargo-packager/commit/2d8b8d7c1af73202639449a00dbc51bf171effc7) Initial Release + +### Dependencies + +- Upgraded to `cargo-packager-config@0.1.0` diff --git a/crates/packager/Cargo.toml b/crates/packager/Cargo.toml index d2300b5a..03ea8a93 100644 --- a/crates/packager/Cargo.toml +++ b/crates/packager/Cargo.toml @@ -1,64 +1,67 @@ [package] name = "cargo-packager" -version = "0.1.0" +version = "0.1.1" description = "Rust executable packager and bundler CLI and library." authors = [ - "CrabNebula Ltd.", - "Tauri Programme within The Commons Conservancy", - "George Burton ", + "CrabNebula Ltd.", + "Tauri Programme within The Commons Conservancy", + "George Burton " ] edition = "2021" license = "Apache-2.0 OR MIT" -keywords = ["bundle", "package", "cargo"] +keywords = [ "bundle", "package", "cargo" ] categories = [ - "command-line-interface", - "command-line-utilities", - "development-tools::cargo-plugins", - "development-tools::build-utils", - "os", + "command-line-interface", + "command-line-utilities", + "development-tools::cargo-plugins", + "development-tools::build-utils", + "os" ] repository = "https://github.com/crabnebula-dev/cargo-packager" -[features] -default = ["cli"] -cli = ["clap", "cargo-packager-config/clap", "tracing", "tracing-subscriber"] -tracing = ["dep:tracing"] - [package.metadata.docs.rs] -rustdoc-args = ["--cfg", "doc_cfg"] +rustdoc-args = [ "--cfg", "doc_cfg" ] default-target = "x86_64-unknown-linux-gnu" targets = [ - "x86_64-pc-windows-msvc", - "x86_64-unknown-linux-gnu", - "x86_64-apple-darwin", + "x86_64-pc-windows-msvc", + "x86_64-unknown-linux-gnu", + "x86_64-apple-darwin" +] + +[features] +default = [ "cli" ] +cli = [ + "clap", + "cargo-packager-config/clap", + "tracing", + "tracing-subscriber" ] +tracing = [ "dep:tracing" ] [build-dependencies] -cargo-packager-config = { path = "../config", version = "0.0.0" } -serde_json.workspace = true -schemars.workspace = true +cargo-packager-config = { path = "../config", version = "0.1.0" } +serde_json = { workspace = true } +schemars = { workspace = true } [dependencies] -cargo-packager-config = { path = "../config", version = "0.0.0" } -thiserror.workspace = true -serde.workspace = true -serde_json.workspace = true -dunce.workspace = true -dirs.workspace = true -semver.workspace = true -base64.workspace = true -clap = { workspace = true, optional = true, features = ["env"] } +cargo-packager-config = { path = "../config", version = "0.1.0" } +thiserror = { workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +dunce = { workspace = true } +dirs = { workspace = true } +semver = { workspace = true } +base64 = { workspace = true } +clap = { workspace = true, optional = true, features = [ "env" ] } tracing = { workspace = true, optional = true } -tracing-subscriber = { version = "0.3", optional = true, features = [ - "env-filter", -] } +tracing-subscriber = { version = "0.3", optional = true, features = [ "env-filter" ] } toml = "0.8" cargo_metadata = "0.18" ureq = "2.8" hex = "0.4" sha1 = "0.10" sha2 = "0.10" -zip = { version = "0.6", default-features = false, features = ["deflate"] } +zip = { version = "0.6", default-features = false, features = [ "deflate" ] } handlebars = "4.4" glob = "0.3" relative-path = "1.9" @@ -71,12 +74,15 @@ libflate = "2.0" [target."cfg(target_os = \"windows\")".dependencies] winreg = "0.51" once_cell = "1.18" -uuid = { version = "1", features = ["v4", "v5"] } +uuid = { version = "1", features = [ "v4", "v5" ] } regex = "1.9" -[target."cfg(target_os = \"windows\")".dependencies.windows-sys] -version = "0.48" -features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"] + [target."cfg(target_os = \"windows\")".dependencies.windows-sys] + version = "0.48" + features = [ + "Win32_System_SystemInformation", + "Win32_System_Diagnostics_Debug" +] [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\"))".dependencies] image = "0.24" @@ -86,7 +92,7 @@ ar = "0.9" [target."cfg(target_os = \"macos\")".dependencies] icns = { package = "tauri-icns", version = "0.1" } -time = { version = "0.3", features = ["formatting"] } +time = { version = "0.3", features = [ "formatting" ] } plist = "1" image = "0.24" tempfile = "3" diff --git a/crates/packager/schema.json b/crates/packager/schema.json index d3c458d0..4f538540 100644 --- a/crates/packager/schema.json +++ b/crates/packager/schema.json @@ -591,7 +591,7 @@ } }, "desktopTemplate": { - "description": "Path to a custom desktop file Handlebars template.\n\nAvailable variables: `categories`, `comment` (optional), `exec`, `icon` and `name`.\n\nDefault file contents: ```text ```", + "description": "Path to a custom desktop file Handlebars template.\n\nAvailable variables: `categories`, `comment` (optional), `exec`, `icon` and `name`.\n\nDefault file contents: ```text [Desktop Entry] Categories={{categories}} {{#if comment}} Comment={{comment}} {{/if}} Exec={{exec}} Icon={{icon}} Name={{name}} Terminal=false Type=Application {{#if mime_type}} MimeType={{mime_type}} {{/if}} ```", "type": [ "string", "null"