diff --git a/Cargo.toml b/Cargo.toml index 9598e00..1c58167 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cert-tools" description = "Application to show and merge content of PEM files" -version = "0.1.0" +version = "0.2.0" edition = "2021" license = "GPL-3.0-or-later" authors = ["Paul-Christian Volkmer"] diff --git a/Makefile b/Makefile index a2a4c0b..660a369 100644 --- a/Makefile +++ b/Makefile @@ -46,13 +46,29 @@ binary-all: win-binary-x86_64 linux-binary-x86_64 .PHONY: win-binary-x86_64 win-binary-x86_64: + # Temp cargo file + cp Cargo.toml Cargo.toml.0 + cp ui/Cargo.toml ui/Cargo.toml.0 + sed -i 's/^version.*/version = $(VERSION)/' Cargo.toml + sed -i 's/^version = .*/version = $(VERSION)/' ui/Cargo.toml cargo build --release --target=x86_64-pc-windows-gnu cargo build --release --package cert-tools-ui --target=x86_64-pc-windows-gnu + # Restore temp + mv Cargo.toml.0 Cargo.toml + mv ui/Cargo.toml.0 ui/Cargo.toml .PHONY: linux-binary-x86_64 linux-binary-x86_64: + # Temp cargo file + cp Cargo.toml Cargo.toml.0 + cp ui/Cargo.toml ui/Cargo.toml.0 + sed -i 's/^version.*/version = $(VERSION)/' Cargo.toml + sed -i 's/^version = .*/version = $(VERSION)/' ui/Cargo.toml cargo build --release --target=x86_64-unknown-linux-gnu cargo build --release --package cert-tools-ui --target=x86_64-unknown-linux-gnu + # Restore temp + mv Cargo.toml.0 Cargo.toml + mv ui/Cargo.toml.0 ui/Cargo.toml .PHONY: install install: diff --git a/ui/Cargo.toml b/ui/Cargo.toml index d355f7c..e740b04 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "cert-tools-ui" -version = "0.1.0" +version = "0.2.0" edition = "2021" [dependencies] -cert-tools = { path = "..", version = "*" } +cert-tools = { path = ".." } iced = { version = "0.13", features = ["wgpu", "tiny-skia", "tokio", "web-colors", "image"], default-features = false } rfd = "0.15" itertools = "0.14"