jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update rust versions

This commit is contained in:
Jaby 2024-12-31 18:57:47 +01:00
parent 98e801b4c7
commit f480ce64fe
13 changed files with 95 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Tools/Common.mk
View File

@ -14,13 +14,22 @@ define cp_artifact
endef
define cargo_windows_default
$(if $(findstring upgrade,$(CARGO_CMD)),
cargo $(CARGO_CMD) --$(BUILD_PROFILE),
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(WINDOWS_TARGET)
$(call cp_artifact,$(WINDOWS_ARTIFACT), ../../../bin/$(ARTIFACT).exe)
)
endef
define cargo_unix_default
$(if $(findstring upgrade,$(CARGO_CMD)),
cargo $(CARGO_CMD) --$(BUILD_PROFILE),
cargo $(CARGO_CMD) --$(BUILD_PROFILE) --target=$(UNIX_TARGET)
$(call cp_artifact,$(UNIX_ARTIFACT), ../../../bin/$(ARTIFACT))
)
endef
# Run `cargo install cargo-edit --locked`to support upgrade
# Windows build requires "rustup target add x86_64-pc-windows-gnu" and "sudo apt-get install mingw-w64"

3
src/Tools/Makefile
View File

@ -1,4 +1,5 @@
PROJECTS = cpp_out psxfileconv mkoverlay psxcdgen_ex psxreadmap wslpath
SUPPORT_PROJECTS = cdtypes tool_helper
PROJECTS = cpp_out psxfileconv mkoverlay psxcdgen_ex psxreadmap wslpath
.PHONY: $(PROJECTS)
$(foreach var,$(PROJECTS),$(var)):

4
src/Tools/Tools.code-workspace
View File

@ -66,14 +66,14 @@
{
"id": "build cfg",
"type": "pickString",
"options": ["debug", "release"],
"options": ["debug", "release", "compatible", "incompatible"],
"default": "release",
"description": "build configuration"
},
{
"id": "cargo cmd",
"type":"pickString",
"options": ["build", "check", "update", "clean", "run", "tree"],
"options": ["build", "check", "update", "upgrade", "clean", "run", "tree"],
"default": "build",
"description": "cargo command to run"
}

6
src/Tools/cdtypes/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "cdtypes"
version = "0.7.2"
version = "1.0.0"
edition = "2021"
[profile.release]
@ -8,5 +8,5 @@ panic = "abort"
[dependencies]
byteorder = "1.5.0"
chrono = "0.4.31"
paste = "1.0.14"
chrono = "0.4.39"
paste = "1.0.15"

13
src/Tools/cdtypes/Makefile Normal file
View File

@ -0,0 +1,13 @@
include ../Common.mk
ARTIFACT = cdtypes
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
$(WINDOWS_ARTIFACT):
$(call cargo_windows_default)
$(UNIX_ARTIFACT):
$(call cargo_unix_default)
all-windows: $(WINDOWS_ARTIFACT)
all: $(UNIX_ARTIFACT)

2
src/Tools/cpp_out/Cargo.toml
View File

@ -7,5 +7,5 @@ edition = "2021"
panic = "abort"
[dependencies]
clap = {version = "4.4.11", features = ["derive"]}
clap = {version = "4.5.23", features = ["derive"]}
tool_helper = {path = "../tool_helper"}

4
src/Tools/mkoverlay/Cargo.toml
View File

@ -7,6 +7,6 @@ edition = "2021"
panic = "abort"
[dependencies]
clap = {version = "4.4.11", features = ["derive"]}
serde_json = "1.0.108"
clap = {version = "4.5.23", features = ["derive"]}
serde_json = "1.0.134"
tool_helper = {path = "../tool_helper"}

6
src/Tools/psxcdgen_ex/Cargo.toml
View File

@ -8,10 +8,10 @@ panic = "abort"
[dependencies]
cdtypes = {path = "../cdtypes"}
clap = {version = "4.4.11", features = ["derive"]}
colored = "2.1.0"
clap = {version = "4.5.23", features = ["derive"]}
colored = "2.2.0"
hound = "3.5.1"
no-comment = "0.0.3"
paste = "1.0.14"
paste = "1.0.15"
roxmltree = "0.19.0"
tool_helper = {path = "../tool_helper"}

10
src/Tools/psxfileconv/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "psxfileconv"
version = "0.9.0"
version = "1.0.0"
edition = "2021"
[profile.release]
@ -28,11 +28,11 @@ symphonia-vorbis = ["symphonia", "symphonia/vorbis"]
[dependencies]
bitflags = "2.6.0"
cdtypes = {path = "../cdtypes"}
clap = {version = "4.4.11", features = ["derive"]}
image = "0.24.7"
clap = {version = "4.5.23", features = ["derive"]}
image = "0.24.9"
hound = "3.5.1"
paste = "1.0.14"
png = "0.17.10"
paste = "1.0.15"
png = "0.17.16"
rubato = "0.16.1"
symphonia = {version = "0.5.4", optional = true, default-features = false}
tool_helper = {path = "../tool_helper"}

2
src/Tools/psxreadmap/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
panic = "abort"
[dependencies]
clap = {version = "4.4.11", features = ["derive"]}
clap = {version = "4.5.23", features = ["derive"]}
crossterm = "0.27.0"
ratatui = "0.25.0"
readmap = {version = "*", path = "readmap"}

8
src/Tools/tool_helper/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "tool_helper"
version = "0.9.8"
version = "1.0.0"
edition = "2021"
[profile.release]
@ -9,9 +9,9 @@ panic = "abort"
[dependencies]
byteorder = "1.5.0"
cdtypes = {path = "../cdtypes"}
colored = "2.0.4"
colored = "2.2.0"
envmnt = "0.10.4"
hound = "3.5.1"
lz4 = "1.24.0"
paste = "1.0.14"
lz4 = "1.28.0"
paste = "1.0.15"
wslpath = {path = "../wslpath"}

13
src/Tools/tool_helper/Makefile Normal file
View File

@ -0,0 +1,13 @@
include ../Common.mk
ARTIFACT = tool_helper
.PHONY: $(WINDOWS_ARTIFACT) $(UNIX_ARTIFACT)
$(WINDOWS_ARTIFACT):
$(call cargo_windows_default)
$(UNIX_ARTIFACT):
$(call cargo_unix_default)
all-windows: $(WINDOWS_ARTIFACT)
all: $(UNIX_ARTIFACT)

2
src/Tools/wslpath/Cargo.toml
View File

@ -7,4 +7,4 @@ edition = "2021"
panic = "abort"
[dependencies]
clap = {version = "4.4.7", features = ["derive"]}
clap = {version = "4.5.23", features = ["derive"]}