diff --git a/CREDITS.md b/CREDITS.md index 9b43f38..c9e8387 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,18 +1,18 @@ # Project Dependencies Package: yesvgmap - Version: 0.5.0 - Generated: 2023-10-05 21:56:14 UTC + Version: 0.5.1 + Generated: 2024-01-21 05:43:51 UTC | Package | Version | Author(s) | License | | ---- | ---- | ---- | ---- | -| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.3 | [Tom Kaitchuck](mailto:tom.kaitchuck@gmail.com) | Apache-2.0 or MIT | -| [argyle](https://github.com/Blobfolio/argyle) | 0.6.8 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | +| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.7 | [Tom Kaitchuck](mailto:tom.kaitchuck@gmail.com) | Apache-2.0 or MIT | +| [argyle](https://github.com/Blobfolio/argyle) | 0.7.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | | [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:alex@alexcrichton.com) | Apache-2.0 or MIT | -| [dactyl](https://github.com/Blobfolio/dactyl) | 0.5.2 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | -| [dowser](https://github.com/Blobfolio/dowser) | 0.8.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | +| [dactyl](https://github.com/Blobfolio/dactyl) | 0.6.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | +| [dowser](https://github.com/Blobfolio/dowser) | 0.8.1 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | | [fastrand](https://github.com/smol-rs/fastrand) | 2.0.1 | [Stjepan Glavina](mailto:stjepang@gmail.com) | Apache-2.0 or MIT | -| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.11.6 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | -| [num-traits](https://github.com/rust-num/num-traits) | 0.2.16 | The Rust Project Developers | Apache-2.0 or MIT | +| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.11.8 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | | [svg](https://github.com/bodoni/svg) | 0.14.0 | [Adam Bryant](mailto:adam.w.bryant@outlook.com), [Felix Schütt](mailto:felix.schuett@maps4print.com), [GeoffreyY](mailto:yeungchingho123@gmail.com), [Gijs Burghoorn](mailto:g.burghoorn@gmail.com), [Ivan Ukhov](mailto:ivan.ukhov@gmail.com), [Jack Greenbaum](mailto:j.greenbaum@computer.org), [Mike Wilkerson](mailto:mwilkerson@gmail.com), [Nathan Hüsken](mailto:nathan@wintercloud.de), [Nathaniel Cook](mailto:nvcook42@gmail.com), [Nick Angelou](mailto:angelou.nick@gmail.com), [Nicolas Silva](mailto:nical@fastmail.com), [Nor Khasyatillah](mailto:mazznoer@ymail.com), [OCTronics](mailto:octronics@riseup.net), [Patrick Chieppe](mailto:patrick.chieppe@hotmail.com), [Will Nelson](mailto:will@wnelson.xyz), [Xander Rudelis](mailto:xander.rudelis@gmail.com), [e-matteson](mailto:e.r.matteson@gmail.com), and [kmkzt](mailto:info.pscreator@gmail.com) | Apache-2.0 or MIT | -| [tempfile](https://github.com/Stebalien/tempfile) | 3.8.0 | [Steven Allen](mailto:steven@stebalien.com), The Rust Project Developers, [Ashley Mannix](mailto:ashleymannix@live.com.au), and [Jason White](mailto:me@jasonwhite.io) | Apache-2.0 or MIT | +| [tempfile](https://github.com/Stebalien/tempfile) | 3.9.0 | [Steven Allen](mailto:steven@stebalien.com), The Rust Project Developers, [Ashley Mannix](mailto:ashleymannix@live.com.au), and [Jason White](mailto:me@jasonwhite.io) | Apache-2.0 or MIT | | [write_atomic](https://github.com/Blobfolio/write_atomic) | 0.5.0 | [Blobfolio, LLC.](mailto:hello@blobfolio.com) | WTFPL | +| [zerocopy](https://github.com/google/zerocopy) | 0.7.32 | [Joshua Liebow-Feeser](mailto:joshlf@google.com) | Apache-2.0, BSD-2-Clause, or MIT | diff --git a/Cargo.toml b/Cargo.toml index 1643be5..e85992e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yesvgmap" -version = "0.5.0" +version = "0.5.1" license = "WTFPL" authors = ["Josh Stoik "] edition = "2021" @@ -12,14 +12,14 @@ publish = false [package.metadata.deb] maintainer = "Josh Stoik " -copyright = "2022, Blobfolio, LLC " +copyright = "2024, Blobfolio, LLC " license-file = ["./LICENSE", "0"] revision = "1" depends = "$auto" section = "graphics" extended-description = "" assets = [ - ["./target/x86_64-unknown-linux-gnu/release/yesvgmap", "usr/bin/", "755"], + ["./target/release/yesvgmap", "usr/bin/", "755"], ["./release/completions/yesvgmap.bash", "etc/bash_completion.d/", "644"], ["./release/man/yesvgmap.1.gz", "usr/share/man/man1/", "644"], ] @@ -52,7 +52,7 @@ description = "Print version information and exit." short = "-l" long = "--list" label = "" -description = "Read (absolute) file and/or directory paths from this text file, one entry per line." +description = "Read (absolute) file and/or directory paths from this text file — or STDIN if '-' — one entry per line, instead of or addition to (actually trailing) ." path = true [[package.metadata.bashman.options]] @@ -86,7 +86,7 @@ description = "One or more file and/or directory paths to crunch and/or (recursi dowser = "0.8.*" [dependencies] -argyle = "0.6.*" +argyle = "0.7.*" dowser = "0.8.*" fyi_msg = "0.11.*" svg = "=0.14.0" diff --git a/README.md b/README.md index 49dfed9..2d09493 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Generally speaking, directly inlining an SVG makes more sense than using a sprit See also: [CREDITS.md](CREDITS.md) -Copyright © 2023 [Blobfolio, LLC](https://blobfolio.com) <hello@blobfolio.com> +Copyright © 2024 [Blobfolio, LLC](https://blobfolio.com) <hello@blobfolio.com> This work is free. You can redistribute it and/or modify it under the terms of the Do What The Fuck You Want To Public License, Version 2. diff --git a/justfile b/justfile index a5d8c4a..21db1ae 100644 --- a/justfile +++ b/justfile @@ -20,10 +20,12 @@ pkg_name := "Yesvgmap" pkg_dir1 := justfile_directory() cargo_dir := "/tmp/" + pkg_id + "-cargo" -cargo_bin := cargo_dir + "/x86_64-unknown-linux-gnu/release/" + pkg_id +cargo_bin := cargo_dir + "/release/" + pkg_id doc_dir := justfile_directory() + "/doc" release_dir := justfile_directory() + "/release" +export RUSTFLAGS := "-C target-cpu=x86-64-v3" + # Build Release! @@ -32,7 +34,6 @@ release_dir := justfile_directory() + "/release" cargo build \ --bin "{{ pkg_id }}" \ --release \ - --target x86_64-unknown-linux-gnu \ --target-dir "{{ cargo_dir }}" @@ -52,30 +53,6 @@ release_dir := justfile_directory() + "/release" mv "{{ justfile_directory() }}/target" "{{ cargo_dir }}" -@build-pgo: clean - [ ! -d "/tmp/pgo-data" ] || rm -rf /tmp/pgo-data - - RUSTFLAGS="-Cprofile-generate=/tmp/pgo-data" cargo build \ - --bin "{{ pkg_id }}" \ - --release \ - --target x86_64-unknown-linux-gnu \ - --target-dir "{{ cargo_dir }}" - - "{{ cargo_bin }}" "{{ justfile_directory() }}/test-assets" - "{{ cargo_bin }}" --hidden "{{ justfile_directory() }}/test-assets" - "{{ cargo_bin }}" --offscreen -o /tmp/foo.svg "{{ justfile_directory() }}/test-assets" - rm /tmp/foo.svg - - /usr/local/rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata \ - merge -o /tmp/pgo-data/merged.profdata /tmp/pgo-data - - RUSTFLAGS="-Cprofile-use=/tmp/pgo-data/merged.profdata -Cllvm-args=-pgo-warn-missing-function" cargo build \ - --bin "{{ pkg_id }}" \ - --release \ - --target x86_64-unknown-linux-gnu \ - --target-dir "{{ cargo_dir }}" - - @clean: # Most things go here. [ ! -d "{{ cargo_dir }}" ] || rm -rf "{{ cargo_dir }}" @@ -91,7 +68,6 @@ release_dir := justfile_directory() + "/release" clear cargo clippy \ --release \ - --target x86_64-unknown-linux-gnu \ --target-dir "{{ cargo_dir }}" @@ -101,27 +77,11 @@ release_dir := justfile_directory() + "/release" just _fix-chown "{{ justfile_directory() }}/CREDITS.md" -# Build Docs. -@doc: - # Make the docs. - cargo doc \ - --release \ - --no-deps \ - --target x86_64-unknown-linux-gnu \ - --target-dir "{{ cargo_dir }}" - - # Move the docs and clean up ownership. - [ ! -d "{{ doc_dir }}" ] || rm -rf "{{ doc_dir }}" - mv "{{ cargo_dir }}/x86_64-unknown-linux-gnu/doc" "{{ justfile_directory() }}" - just _fix-chown "{{ doc_dir }}" - - # Test Run. @run +ARGS: cargo run \ --bin "{{ pkg_id }}" \ --release \ - --target x86_64-unknown-linux-gnu \ --target-dir "{{ cargo_dir }}" \ -- {{ ARGS }} @@ -130,11 +90,9 @@ release_dir := justfile_directory() + "/release" @test: clear cargo test \ - --target x86_64-unknown-linux-gnu \ --target-dir "{{ cargo_dir }}" cargo test \ --release \ - --target x86_64-unknown-linux-gnu \ --target-dir "{{ cargo_dir }}" diff --git a/release/man/yesvgmap.1 b/release/man/yesvgmap.1 index 5125917..b2a5ef7 100644 --- a/release/man/yesvgmap.1 +++ b/release/man/yesvgmap.1 @@ -1,6 +1,6 @@ -.TH "YESVGMAP" "1" "October 2023" "Yesvgmap v0.5.0" "User Commands" +.TH "YESVGMAP" "1" "January 2024" "Yesvgmap v0.5.1" "User Commands" .SH NAME -Yesvgmap \- Manual page for yesvgmap v0.5.0. +Yesvgmap \- Manual page for yesvgmap v0.5.1. .SH DESCRIPTION Generate SVG sprite maps from individual SVG images. .SS USAGE: @@ -22,7 +22,7 @@ Print version information and exit. .SS OPTIONS: .TP \fB\-l\fR, \fB\-\-list\fR -Read (absolute) file and/or directory paths from this text file, one entry per line. +Read (absolute) file and/or directory paths from this text file — or STDIN if '\-' — one entry per line, instead of or addition to (actually trailing) . .TP \fB\-\-map\-class\fR Add this class to the generated SVG map. [default: ] diff --git a/src/main.rs b/src/main.rs index b247ace..af1ba0c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -179,7 +179,9 @@ FLAGS: OPTIONS: -l, --list Read (absolute) file and/or directory paths - from this text file, one entry per line. + from this text file — or STDIN if "-" — one + entry per line, instead of or addition to + (actually trailing) . --map-class Add this class to the generated SVG map. [default: ] --map-id Add this ID to the generated SVG map.